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)
* commit '3166fd6ad9a893f26e4f881328243fdfd8c6c029':
  JOO26B
  JOO26
  JOO25
  JOO24B
  JOO24


Trivial merge