am c6a1c584: am 6815d49c: Reconcile with ics-mr1-release

* commit 'c6a1c58452bc9207cc7dba8ad40ad0535fb356bb':
This commit is contained in:
The Android Open Source Project 2012-02-23 11:20:16 -08:00 committed by Android Git Automerger
commit 270d627166

Diff Content Not Available