am 3ebb3dad: Reconcile with ics-mr1-release

* commit '3ebb3dad6e8da55b2057d064c2c0275f478b4f61':
This commit is contained in:
The Android Open Source Project 2012-03-21 08:26:53 -07:00 committed by Android Git Automerger
commit 049a788284

Diff Content Not Available