am 1b251bde: Reconcile with ics-mr1-release

* commit '1b251bde764bcf3b689ee1942e005a821bd06d17':
This commit is contained in:
The Android Open Source Project 2011-12-13 19:13:11 -08:00 committed by Android Git Automerger
commit 9f39cde527

Diff Content Not Available