Reconcile with ics-mr1-release
The Android Open Source Project [Sat, 7 Jan 2012 02:15:49 +0000 (18:15 -0800)]
Change-Id: Ia5f0f8633b530dd4f551be4776206639b926fc18


Trivial merge