am 8534a2a7: Reconcile with ics-mr1-release
* commit '8534a2a77e2a28918c0777508514b1279c3a24e5':
This commit is contained in:
committed by
Android Git Automerger
commit
26cc4ddd0d