OSDN Git Service

am 70b0d157: am 0f03bad3: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Mar 2012 00:46:20 +0000 (16:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 2 Mar 2012 00:46:20 +0000 (16:46 -0800)
commit10cae8ecd855ee91baf9caad2e9c873632950df4
tree827af4f82d18e7c4b8fedc056b246decd2e69506
parentfe7293ff5e0a2b6788ff1617e3a00900e790e22c
parent70b0d157985cd47e858ae515f235bac779338440
am 70b0d157: am 0f03bad3: Reconcile with ics-mr1-release

* commit '70b0d157985cd47e858ae515f235bac779338440':