OSDN Git Service

am 0062f811: 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:06:43 +0000 (08:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Aug 2012 15:06:43 +0000 (08:06 -0700)
* commit '0062f811c0727e329bf96a75876a99e661419d0f':
  JRO03P


Trivial merge