OSDN Git Service

am c9054b11: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 Jan 2012 23:52:13 +0000 (15:52 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 Jan 2012 23:52:13 +0000 (15:52 -0800)
commita7fbf6769cb615e55a9d0c1feb217047a29c1649
tree19aa24ff0f5b7c2b1731dc840fe20e6feb0cbb89
parentfcf246c989110d76a80fc66ac72f1fbba4289ff6
parentc9054b11fa3895fe70b2eaba849c6388df449c1e
am c9054b11: Reconcile with ics-mr1-release

* commit 'c9054b11fa3895fe70b2eaba849c6388df449c1e':
  IMM18
  IMM13
  IMM12