am d5280e51: Reconcile with ics-mr0-release

* commit 'd5280e51aa4578ff47bffc166f74d79c17358589':
This commit is contained in:
The Android Open Source Project 2011-11-18 13:35:32 -08:00 committed by Android Git Automerger
commit 17ddb89806

Diff Content Not Available