OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca61c25 273464d)
am 273464d5: am aa1f8aee: Clarify backup setting
authorKenny Root <kroot@google.com>
Thu, 3 Jun 2010 22:07:14 +0000 (15:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Jun 2010 22:07:14 +0000 (15:07 -0700)
Merge commit '273464d5a1369a784eebeebaa4a4f8b4371b7699' into kraken

* commit '273464d5a1369a784eebeebaa4a4f8b4371b7699':
  Clarify backup setting

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