OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5330df5 d5f3ae5)
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258...
authorDmitry Dementyev <dementyev@google.com>
Thu, 9 Mar 2017 18:29:27 +0000 (18:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Mar 2017 18:29:27 +0000 (18:29 +0000)
am: d5f3ae5cac

Change-Id: Iacd8197fe2d48921a7b5adc71298ae8a00bb871d


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