OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a496684 aa1f8ae)
am aa1f8aee: Clarify backup setting
authorKenny Root <kroot@google.com>
Thu, 3 Jun 2010 22:02:13 +0000 (15:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Jun 2010 22:02:13 +0000 (15:02 -0700)
Merge commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385' into froyo-plus-aosp

* commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385':
  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