OSDN Git Service

am f5cc87ba: (-s ours) am 60573fd6: (-s ours) Reconcile with jb-nakasig-release jb...
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Sep 2012 14:52:59 +0000 (07:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Sep 2012 14:52:59 +0000 (07:52 -0700)
commit679c369e1949dc2befa9bae1880bee244fd0ac5a
treee808421e2b0859c677d89ffcf3d8f205c1c349a8
parent7a17b742173b55ef12063a06cfebd405bcc152b1
parentf5cc87bae46e9aa3ebdca60f047b2bfe15132f54
am f5cc87ba: (-s ours) am 60573fd6: (-s ours) Reconcile with jb-nakasig-release jb-mr0-release - do not merge

* commit 'f5cc87bae46e9aa3ebdca60f047b2bfe15132f54':
  JZO54G
  JGO73
  JZO54F
  JGO72
  JGO71
  JGO70