OSDN Git Service

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

Change-Id: Ie761a3c3472ba8ae2c54acc32c1368378bc54fb5


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