OSDN Git Service

am 1a0f6725: (-s ours) Reconcile with jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:05:37 +0000 (08:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Aug 2012 15:05:37 +0000 (08:05 -0700)
commit0062f811c0727e329bf96a75876a99e661419d0f
treed52083a7227e09b898f6007767ef44658dd22352
parentd3ee366af2ce12093478c35b14a1160599b27f71
parent1a0f6725392279ed6b44e97b00315b8173abf454
am 1a0f6725: (-s ours) Reconcile with jb-release - do not merge

* commit '1a0f6725392279ed6b44e97b00315b8173abf454':
  JRO03P