am d039dc9a: Reconcile with ics-mr1-release

* commit 'd039dc9a5d463b4b21609449a879175c76b9a939':
This commit is contained in:
The Android Open Source Project 2011-11-30 14:05:16 -08:00 committed by Android Git Automerger
commit c201dc8e0e

Diff Content Not Available