am dc1a57e6: Reconcile with ics-mr1-release

* commit 'dc1a57e6ba11de585a6fd19c1e680946ad9fe5a5':
This commit is contained in:
The Android Open Source Project 2011-12-07 07:48:54 -08:00 committed by Android Git Automerger
commit 9600a0b9f4

Diff content is not available