am 8979ea78: Reconcile with ics-mr1-release

* commit '8979ea78666d24de5c36c8b56deba90f0f7506ec':
main
The Android Open Source Project 2011-11-10 22:39:00 +00:00 committed by Android Git Automerger
commit edeb2bb2c0

Diff Content Not Available