am 76a3777a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '76a3777a4d6c3233ba2935828371abd3fbbac843':
This commit is contained in:
The Android Open Source Project 2012-09-12 16:58:49 -07:00 committed by Android Git Automerger
commit b8ceb988ea

Diff Content Not Available