am 5ea382d2: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '5ea382d2080a5854ac9c8397e27d2b895e520470':
This commit is contained in:
The Android Open Source Project authored and Android Git Automerger committed 2012-09-28 00:32:55 -07:00
commit 05ea1beade

Diff Content Not Available