am 5e966ef6: Reconcile with jb-release

* commit '5e966ef64bda21a14b5f835040f515932c52e966':
This commit is contained in:
The Android Open Source Project 2012-07-27 15:45:33 -07:00 committed by Android Git Automerger
commit 657ea79b62

Diff Content Not Available