OSDN Git Service

am ad808f5d: (-s ours) Reconcile with jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 3 Aug 2012 20:25:06 +0000 (13:25 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 3 Aug 2012 20:25:06 +0000 (13:25 -0700)
commitfa3c2d9a766202c026e2856ec9111b69a06c6f4c
treea1c2d75ba2ad3f2fa032e6923bce9ca1c02eee61
parentc814bcefd7ff65cbc91b66fb67a038fbd6ec9944
parentad808f5da422b13489edb04b38daf871e5f977a6
am ad808f5d: (-s ours) Reconcile with jb-release - do not merge

* commit 'ad808f5da422b13489edb04b38daf871e5f977a6':
  JRO03L
  JRO03K
  JRO03J
  JRO03I