OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 436e1d2 00615cf)
Merge "DO NOT MERGE Proxy and IP fixes" into honeycomb-mr1
authorIrfan Sheriff <isheriff@google.com>
Thu, 3 Mar 2011 23:02:05 +0000 (15:02 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 3 Mar 2011 23:02:05 +0000 (15:02 -0800)
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