am b71766ef: Reconcile with ics-mr1-release

* commit 'b71766efa0764380f1d2537c742395ec0cc9ac75':
This commit is contained in:
The Android Open Source Project 2012-01-05 12:08:49 -08:00 committed by Android Git Automerger
commit faefb0e8b5

Diff Content Not Available