OSDN Git Service

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

Change-Id: I69d192ea59bd5c2b79abd513e88aecc78a0d6980


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