am 2c49911b: Reconcile with ics-mr1-release

* commit '2c49911b21b275810ddcde0d2bcebf900099d02d':
This commit is contained in:
The Android Open Source Project
2011-12-21 07:21:43 -08:00
committed by Android Git Automerger

Diff Content Not Available