OSDN Git Service

am c4c305e3: am a2ca4f14: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 Feb 2012 19:19:50 +0000 (11:19 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Feb 2012 19:19:50 +0000 (11:19 -0800)
* commit 'c4c305e331e4e5ae3f5616f79dfc597e2abfc166':
  IMM48


Trivial merge