am f4935a2c: Reconcile with ics-mr1-release

* commit 'f4935a2cc4e68fea8f4372ad41031b0e20272cc8':
This commit is contained in:
The Android Open Source Project 2012-02-16 10:14:01 -08:00 committed by Android Git Automerger
commit 649e534f8e

Diff Content Not Available