Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 30 Nov 2011 20:56:21 +0000 (12:56 -0800)]
Change-Id: Icd5311e1b9183fbbfd51d05f6fc1719037528e3c


Trivial merge