OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 270f217 8d9e305)
resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 -s ours
authorPhil Weaver <pweaver@google.com>
Thu, 31 Aug 2017 18:06:49 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Aug 2017 18:06:49 +0000 (18:06 +0000)
am: 8d9e305d84  -s ours

Change-Id: I97f195764e77daba922c7b855d50e41f29e512c9


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