OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 059c3f5 3a0fc70)
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform...
authorDan Vacura <dan.vacura@motorola.com>
Tue, 6 Oct 2009 10:05:02 +0000 (03:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Oct 2009 10:05:02 +0000 (03:05 -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