am b0700a34: Reconcile with ics-mr1-release

* commit 'b0700a342e41e34d5ab6fda1eb25fcdbe2da927a':
This commit is contained in:
The Android Open Source Project 2011-11-18 15:46:42 -08:00 committed by Android Git Automerger
commit b62c3aca60

Diff content is not available