am d32ee5ba: Reconcile with ics-mr1-release

* commit 'd32ee5baa057992431263907ec5cf8f19b43c043':
This commit is contained in:
The Android Open Source Project 2012-01-05 12:08:48 -08:00 committed by Android Git Automerger
commit d9f8d8b0af

Diff Content Not Available