OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2b54ee 6df18e2)
Merge "New dream settings - first cut" into jb-mr1-dev
authorJohn Spurlock <jspurlock@google.com>
Wed, 29 Aug 2012 22:55:25 +0000 (15:55 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 29 Aug 2012 22:55:25 +0000 (15:55 -0700)
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