OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71964dd 626b4a1)
merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 1 Sep 2009 15:28:18 +0000 (08:28 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 1 Sep 2009 15:28:18 +0000 (08:28 -0700)
1  2 
AndroidManifest.xml patch | diff1 | diff2 | blob | history
res/values/strings.xml patch | diff1 | diff2 | blob | history

diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help