am 55231bc5: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 18:01:13 +0000 (10:01 -0800)]
* commit '55231bc588e71c23f9d6ac5a94e72e96c3825991':


Trivial merge