OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18d2b15 bb4bdc2)
Merge "Add on/off actionbar switch for NFC Tap To Share."
authorMartijn Coenen <maco@google.com>
Thu, 28 Jul 2011 13:48:55 +0000 (06:48 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 28 Jul 2011 13:48:55 +0000 (06:48 -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