am 16bdd1e6: Reconcile with ics-mr1-release

* commit '16bdd1e65ef19379bbede40c38de2e9f816ba35b':
This commit is contained in:
The Android Open Source Project 2011-12-13 19:13:18 -08:00 committed by Android Git Automerger
commit 03332a089f

Diff Content Not Available