am 8eb948d8: Reconcile with ics-mr1-release

* commit '8eb948d8c8b66d8442a45d398db4e970fb3bf68b':
This commit is contained in:
The Android Open Source Project 2012-01-20 15:52:14 -08:00 committed by Android Git Automerger
commit d8545e2690

Diff content is not available