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

* commit '0993a89b31eea938b72b925d078f5c68322885f8':
This commit is contained in:
The Android Open Source Project 2011-11-16 09:39:39 -08:00 committed by Android Git Automerger
commit 78748a6317

Diff content is not available