am 40375099: Reconcile with ics-mr1-release

* commit '40375099d10139b6c96c1db8b8295874d60c712e':
This commit is contained in:
The Android Open Source Project 2011-12-12 15:39:19 -08:00 committed by Android Git Automerger
commit 0f11d886bf

Diff Content Not Available