am 8a7d620a: am 4124016a: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '8a7d620aa0ad7bada6f50b757d1bc328db1fe257':
This commit is contained in:
The Android Open Source Project authored and Android Git Automerger committed 2012-07-31 14:52:54 -07:00
commit cb4a1e65ff

Diff Content Not Available