am 55231bc5: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 18:01:13 +0000 (10:01 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Feb 2012 18:01:13 +0000 (10:01 -0800)
commit71d3ff5dd317c5957f1f6b0cc877a3fceabbb445
treed0806fb582fca54e82542697b0165dd6617f6ab9
parent3ddc6cc0e16136d863df51a8e0e36b0558dcde62
parent55231bc588e71c23f9d6ac5a94e72e96c3825991
am 55231bc5: Reconcile with ics-mr1-release

* commit '55231bc588e71c23f9d6ac5a94e72e96c3825991':