OSDN Git Service

am 3166fd6a: Reconcile with jb-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Jul 2012 22:47:19 +0000 (15:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 27 Jul 2012 22:47:19 +0000 (15:47 -0700)
commitd5cb2c2f14238302c321cee2bb6b76f44b45b946
treeca9a70bc9662a9dc3481db1923f5412cb9ed10b7
parent18d9c456e1adb0b3c5f3c4d3fd0b28a99be08cf9
parent3166fd6ad9a893f26e4f881328243fdfd8c6c029
am 3166fd6a: Reconcile with jb-mr1-release

* commit '3166fd6ad9a893f26e4f881328243fdfd8c6c029':
  JOO26B
  JOO26
  JOO25
  JOO24B
  JOO24