OSDN Git Service

am f6b165e0: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 2 Aug 2012 22:08:59 +0000 (15:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Aug 2012 22:08:59 +0000 (15:08 -0700)
commit87ff537108c5df3241143d295d1fad3b54735365
treec3c559d650e9426a371b6dc47e6674b86488f927
parent39aa4199293bd088c48ab662850a1d5ff840607c
parentf6b165e0232c315d91c3ba2c394da27234012fd9
am f6b165e0: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'f6b165e0232c315d91c3ba2c394da27234012fd9':
  JOO33
  JOO32C
  JOO33