OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5fe385a
768ebe5
)
am 768ebe51: (-s ours) am 2a5f755a: am 8665eb73: (-s ours) Reconcile with jb-mr0...
author
The Android Open Source Project
<initial-contribution@android.com>
Tue, 31 Jul 2012 21:53:26 +0000
(14:53 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 31 Jul 2012 21:53:26 +0000
(14:53 -0700)
* commit '
768ebe51f4490cd8a84a42b13f84ba5e6a366d11
':
JZO31
JRO03N
JRO03M
Trivial merge