OSDN Git Service

am b2c31c3e: (-s ours) am a7b0ec3c: (-s ours) Reconcile with jb-nakasig-release jb...
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Sep 2012 23:43:44 +0000 (16:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Sep 2012 23:43:44 +0000 (16:43 -0700)
commit6b1d87e83cff315c64e098183e94cc74bd66472d
tree8732801174a048218f79016e455ffb1efdeab309
parent528663dfc42a0dea8f6476aa5e2188e4aa4342ed
parentb2c31c3ec814479bde1d0f7ed633653a8045a081
am b2c31c3e: (-s ours) am a7b0ec3c: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge

* commit 'b2c31c3ec814479bde1d0f7ed633653a8045a081':
  JRO03W
  JRO69
  JGO69
  JGO68
  JGO67
  JZO54E