OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ac78f2 b01c080)
Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
authorLorenzo Colitti <lorenzo@google.com>
Mon, 3 Oct 2016 23:37:09 +0000 (23:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 3 Oct 2016 23:37:10 +0000 (23:37 +0000)

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