OSDN Git Service

am 103a052e: (-s ours) am 43b91298: am 34d12aaf: Reconcile with jb-mr1-release -...
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 14:17:37 +0000 (06:17 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Nov 2012 14:17:37 +0000 (06:17 -0800)
commit5bc5cfcefad722ebfdd44ef4483289138f68a808
tree06cf00d20f545c91079674ca3290e0a4fa605f94
parent334423b749dc8e9d0cbf8a254ebcfebf7043b315
parent103a052e340b409ff6ccecadaee8cc3fdc62dcf0
am 103a052e: (-s ours) am 43b91298: am 34d12aaf: Reconcile with jb-mr1-release - do not merge

* commit '103a052e340b409ff6ccecadaee8cc3fdc62dcf0':
  JOP37