am c2af71bf: Reconcile with ics-mr1-release
* commit 'c2af71bf8f3f58e07d8e53ab7809caf866ffd527':
This commit is contained in:
committed by
Android Git Automerger
commit
139f2851c9