am 8be83b84: Reconcile with jb-release

* commit '8be83b841ffd5b02195073070cec9f041541cad9':
main
The Android Open Source Project 2012-05-30 10:22:16 -07:00 committed by Android Git Automerger
commit da4636f583

Diff Content Not Available