OSDN Git Service

am eaa83bbd: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Aug 2012 22:15:44 +0000 (15:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Aug 2012 22:15:44 +0000 (15:15 -0700)
commit4383fc58423d8a51d97be51774dab703c1d59e3e
treecb0bc09c02ededfbe82a3183266f80964645dcac
parent26b952db1f54475043f5973b2c1a11379b028922
parenteaa83bbd9ff40ff428ef0c6f5eea1f0ddf8a7ff4
am eaa83bbd: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'eaa83bbd9ff40ff428ef0c6f5eea1f0ddf8a7ff4':
  JOO32