Reconcile with ics-mr1-release
The Android Open Source Project [Fri, 18 Nov 2011 23:43:44 +0000 (15:43 -0800)]
Change-Id: I5a17b2bdb6c727bb3bc6fcfcb378ef3557ad0883


Trivial merge