OSDN Git Service

am fa3c2d9a: 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:26:49 +0000 (13:26 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 3 Aug 2012 20:26:49 +0000 (13:26 -0700)
commitb78b24e1bf8a1195fd038c874561db80ea2214c5
treea1c2d75ba2ad3f2fa032e6923bce9ca1c02eee61
parentc91bb757eee86f20e2c8e0ae89d1995e647be1b8
parentfa3c2d9a766202c026e2856ec9111b69a06c6f4c
am fa3c2d9a: am ad808f5d: (-s ours) Reconcile with jb-release - do not merge

* commit 'fa3c2d9a766202c026e2856ec9111b69a06c6f4c':
  JRO03L
  JRO03K
  JRO03J
  JRO03I