OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit37e0c1f3ccbb7b2ff0b38440717c6802f2089a5a
tree73821ecf78f09d88d5e9399b546b766e6e101cfftree | snapshot
parentd1545e506d9c4872c774f0595a5c69370a5340f6commit | diff
parentd88b7364d80947cfea350b5179ea6cb025eed048commit | diff
resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 am: f8a7b8aff0  -s ours
am: d88b7364d8  -s ours

Change-Id: I81d6961428e04f5751a479525756fae14fe5a503
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help