OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94440bd dd37918)
am dd379184: am f0746678: Merge "Redesign vibration settings." into froyo
authorDaniel Sandler <dsandler@android.com>
Thu, 22 Apr 2010 01:19:34 +0000 (18:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Apr 2010 01:19:34 +0000 (18:19 -0700)
Merge commit 'dd3791844f7172fc9f231e4d7666a8f81f86daa7' into kraken

* commit 'dd3791844f7172fc9f231e4d7666a8f81f86daa7':
  Redesign vibration settings.

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