am 23c45bac: Reconcile with ics-mr1-release

* commit '23c45bac209c18dd8fd6260e338e566df946c968':
This commit is contained in:
The Android Open Source Project 2011-12-09 14:57:55 -08:00 committed by Android Git Automerger
commit 646a06ce25

Diff content is not available