am 76533ab5: Reconcile with jb-mr0-release

* commit '76533ab5926089ffde286cd34090eddfc5b9d947':
This commit is contained in:
The Android Open Source Project 2012-07-19 08:52:31 -07:00 committed by Android Git Automerger
commit d323ac913c

Diff content is not available