OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c1a871 ba3c8ed)
Merge "resolve merge conflicts of 31a2f413f8 to master"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 27 Jun 2017 00:14:10 +0000 (00:14 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 27 Jun 2017 00:14:14 +0000 (00:14 +0000)

Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help