OSDN Git Service

am 2a5f755a: am 8665eb73: (-s ours) Reconcile with jb-mr0-release jb-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 21:51:16 +0000 (14:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 31 Jul 2012 21:51:16 +0000 (14:51 -0700)
commit768ebe51f4490cd8a84a42b13f84ba5e6a366d11
treecd14ec94f2dc16feac7aa5cf7546dfe45a72a33b
parentd52c63b09cb50d97ca24e0ffcf6d9d031aa9f48f
parent2a5f755a794b2ce4d4027804bcb1af6ece714933
am 2a5f755a: am 8665eb73: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge

* commit '2a5f755a794b2ce4d4027804bcb1af6ece714933':
  JZO31
  JRO03N
  JRO03M