OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bf3255b
d7fb51a
)
Merge "resolve merge conflicts of 20d9ae562062 to oc-mr1-dev-plus-aosp" into oc-mr1...
author
Andreas Gampe
<agampe@google.com>
Thu, 2 Nov 2017 02:34:06 +0000
(
02:34
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 2 Nov 2017 02:34:06 +0000
(
02:34
+0000)
Trivial merge