OSDN Git Service

am 8665eb73: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 21:49:13 +0000 (14:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 31 Jul 2012 21:49:13 +0000 (14:49 -0700)
commit2a5f755a794b2ce4d4027804bcb1af6ece714933
treecd14ec94f2dc16feac7aa5cf7546dfe45a72a33b
parentff8d3674abc99c0c45543ade969aec803a71177a
parent8665eb732364b31506719dcce99237e13cc87866
am 8665eb73: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge

* commit '8665eb732364b31506719dcce99237e13cc87866':
  JZO31
  JRO03N
  JRO03M