OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b48e46c 4d4ccc9)
am 4d4ccc9a: am 9db5ee35: Add facility to disable system packages.
authorDianne Hackborn <hackbod@google.com>
Mon, 26 Jul 2010 19:29:38 +0000 (12:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 26 Jul 2010 19:29:38 +0000 (12:29 -0700)
Merge commit '4d4ccc9acbf9c46c930129fcb98230886dac5b9f'

* commit '4d4ccc9acbf9c46c930129fcb98230886dac5b9f':
  Add facility to disable system packages.

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