am faefb0e8: am b71766ef: Reconcile with ics-mr1-release

* commit 'faefb0e8b5f294e5e2179d31932ef7e5652865ee':
This commit is contained in:
The Android Open Source Project 2012-01-05 12:13:26 -08:00 committed by Android Git Automerger
commit 3ce35c4ea5

Diff Content Not Available