am 91789538: Reconcile with ics-mr0-release

* commit '917895384fb7c9fb9ca858fdf792ec165e151de9':
This commit is contained in:
The Android Open Source Project 2011-12-08 10:27:13 -08:00 committed by Android Git Automerger
commit 424e8787c9

Diff content is not available