OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5988f37 9b32ed2)
Merge "Rename Automatic color to Adaptive color" into pi-dev am: f32310a7e6
authorPeiyong Lin <lpy@google.com>
Fri, 22 Jun 2018 21:21:24 +0000 (14:21 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jun 2018 21:21:24 +0000 (14:21 -0700)
am: 9b32ed2585

Change-Id: I723a9d1d04cfb696e325427030f0fff13394345d

1  2 
res/values/strings.xml patch | diff1 | diff2 | blob | history

diff --cc res/values/strings.xml
Simple merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help