am 71d3ff5d: am 55231bc5: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 18:06:14 +0000 (10:06 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Feb 2012 18:06:14 +0000 (10:06 -0800)
commitdc8940b538a2261e0f0dbf027362cc1c359c7cd6
treefc2431d4f95cc62d2c73f974f9d7a8994d4bdfd9
parent2404bcadf297cb87254a27982f374bb86b1c74cf
parent71d3ff5dd317c5957f1f6b0cc877a3fceabbb445
am 71d3ff5d: am 55231bc5: Reconcile with ics-mr1-release

* commit '71d3ff5dd317c5957f1f6b0cc877a3fceabbb445':