am c2d5944e: Reconcile with ics-mr1-release

* commit 'c2d5944e19863bb2d831b13893a3bb78e0d53783':
This commit is contained in:
The Android Open Source Project 2011-12-13 19:11:25 -08:00 committed by Android Git Automerger
commit f6aa779383

Diff Content Not Available