Reconcile with ics-factoryrom-2-release

Change-Id: Ie0c40f94cf560dbe14a334d2e177e4e4a9d32eb7
main
The Android Open Source Project 2011-11-16 08:56:47 -08:00
commit 1c0f94c591

Diff Content Not Available