OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d278da7 3a5e567)
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258
authorDmitry Dementyev <dementyev@google.com>
Wed, 8 Mar 2017 19:13:10 +0000 (19:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Mar 2017 19:13:10 +0000 (19:13 +0000)
am: 3a5e567ab9

Change-Id: Ie14fd1ef35f12fffadf4e241e3cd8146a1063d8a


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