am 1c0f94c5: Reconcile with ics-factoryrom-2-release

* commit '1c0f94c5916921ee861933e080d7b0f711b019e1':
This commit is contained in:
The Android Open Source Project 2011-11-16 09:36:12 -08:00 committed by Android Git Automerger
commit 0993a89b31

Diff content is not available