am 96d14980: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jan 2012 21:38:43 +0000 (13:38 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 30 Jan 2012 21:38:43 +0000 (13:38 -0800)
commit580b1e46cd4d78220bbf17f2d5eaa94991fd220d
tree7c2dd6d73e4d7471293ecc85d59b7c35290d6cf8
parent847b3821aad757b63ec3c9499a74ce12b70cf814
parent96d1498016bea5baf3eff8d46ce09df444511430
am 96d14980: Reconcile with ics-mr1-release

* commit '96d1498016bea5baf3eff8d46ce09df444511430':