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:
f83a21d
a69a6a9
)
Merge "resolve merge conflicts of 66a8895 to master"
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Mon, 19 Sep 2016 21:24:32 +0000
(21:24 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Mon, 19 Sep 2016 21:24:33 +0000
(21:24 +0000)
Trivial merge