OSDN Git Service

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

Change-Id: I81d6961428e04f5751a479525756fae14fe5a503


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