am dc8940b5: am 71d3ff5d: am 55231bc5: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 18:09:58 +0000 (10:09 -0800)]
* commit 'dc8940b538a2261e0f0dbf027362cc1c359c7cd6':


Trivial merge