OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6ae921 0de0d5b)
Merge "Game Driver: Add UI support for prerelease Game Driver" into qt-dev
authorYiwei Zhang <zzyiwei@google.com>
Thu, 13 Jun 2019 15:46:47 +0000 (08:46 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Jun 2019 15:46:47 +0000 (08:46 -0700)
am: 0de0d5be39

Change-Id: Ib806945a955125febf2d7eb8c37e735c9e2ade0d

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