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

* commit '6e8f277aab617b849c49f39e8496f9bb34f5ec4a':
main
The Android Open Source Project 2011-11-17 04:13:04 -08:00 committed by Android Git Automerger
commit 3a1a5a25a2

Diff Content Not Available