am 81304325: Reconcile with ics-mr1-release

* commit '81304325161a14e9f9908def807114b33b13dce6':
This commit is contained in:
The Android Open Source Project authored and Android Git Automerger committed 2011-12-12 15:30:00 -08:00
commit 36e0e88cd6

Diff Content Not Available