am 87dde96e: Reconcile with ics-mr1-release

* commit '87dde96eaf234f4e62de3fe1c79c6db8bd55d4a4':
This commit is contained in:
The Android Open Source Project 2011-11-22 13:29:35 -08:00 committed by Android Git Automerger
commit ae575fdc98

Diff Content Not Available