OSDN Git Service
(root)
/
android-x86
/
system-extras.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3d37780
b527177
)
resolve merge conflicts of bd963b08 to oc-dr1-dev-plus-aosp
author
Jin Qian
<jinqian@google.com>
Fri, 21 Jul 2017 22:42:20 +0000
(22:42 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 21 Jul 2017 22:42:20 +0000
(22:42 +0000)
am:
b52717767e
Change-Id: Iba0e28cec12c5c92dd0037bd34253dda545f5d8f
Trivial merge