am 1b841f56: Reconcile with ics-mr1-release

* commit '1b841f56aba672ba938708835aa032ecb126d729':
This commit is contained in:
The Android Open Source Project 2012-02-01 10:01:28 -08:00 committed by Android Git Automerger
commit 32407e615b

Diff content is not available