OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
666d70e
57b641e
)
Merge "resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp" into oc-mr1...
author
Matthew Fritze
<mfritze@google.com>
Tue, 1 Aug 2017 00:28:57 +0000
(
00:28
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 1 Aug 2017 00:28:57 +0000
(
00:28
+0000)
Trivial merge