am c6023243: Reconcile with ics-factoryrom-2-release

* commit 'c60232434c941b5175a9ebb542b1c872866d3409':
This commit is contained in:
The Android Open Source Project 2011-11-16 09:33:01 -08:00 committed by Android Git Automerger
commit b90cb1d20c

Diff content is not available