am 37b1f961: Reconcile with ics-mr1-release

* commit '37b1f961b588950367046dedfc15bb360e0d94a1':
main
The Android Open Source Project 2011-12-06 09:06:23 -08:00 committed by Android Git Automerger
commit b9204690fe

Diff Content Not Available