OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70631ab 19340d2)
am 19340d21: Merge "Labeled categories to help clarify Sound prefs." into froyo
authorDaniel Sandler <dsandler@android.com>
Thu, 22 Apr 2010 01:15:38 +0000 (18:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Apr 2010 01:15:38 +0000 (18:15 -0700)
Merge commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6' into froyo-plus-aosp

* commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6':
  Labeled categories to help clarify Sound prefs.

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