OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c2fccf cd09151)
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev
authorFan Zhang <zhfan@google.com>
Wed, 4 May 2016 17:47:17 +0000 (17:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 4 May 2016 17:47:17 +0000 (17:47 +0000)
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