am 7e4aa24c: Reconcile with ics-mr1-release

* commit '7e4aa24c8701381f542a324df958907194285fdc':
This commit is contained in:
The Android Open Source Project 2011-12-21 07:21:45 -08:00 committed by Android Git Automerger
commit 0f04cd6044

Diff Content Not Available