OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a262b5d e4c0cd6)
am e4c0cd6d: am 365ef4a0: Update strings for backup
authorKenny Root <kroot@google.com>
Fri, 4 Jun 2010 00:09:28 +0000 (17:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Jun 2010 00:09:28 +0000 (17:09 -0700)
Merge commit 'e4c0cd6d8cfae4b96596b280fcd125564d290a86' into kraken

* commit 'e4c0cd6d8cfae4b96596b280fcd125564d290a86':
  Update strings for backup

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