OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2aa7e7 9e47d2c)
Merge "Add modify string to resources." into oc-mr1-dev
authorEric Schwarzenbach <easchwar@google.com>
Wed, 9 Aug 2017 01:04:33 +0000 (01:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 01:04:33 +0000 (01:04 +0000)
am: 9e47d2c233

Change-Id: I439eea568712e0818613ad8b88b2b9770ae72a68

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