OSDN Git Service

am b2c31c3e: am a7b0ec3c: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release...
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Sep 2012 22:24:10 +0000 (15:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Sep 2012 22:24:10 +0000 (15:24 -0700)
* commit 'b2c31c3ec814479bde1d0f7ed633653a8045a081':
  JRO03W
  JRO69
  JGO69
  JGO68
  JGO67
  JZO54E


Trivial merge