am 5ff025a5: Reconcile with jb-release

* commit '5ff025a50ccd7d30ea39c989d9ed8b1084ded47f':
This commit is contained in:
The Android Open Source Project 2012-06-11 09:23:11 -07:00 committed by Android Git Automerger
commit 8f2887be93

Diff Content Not Available