OSDN Git Service

am c611e5a7: b/2334482 Dock string changed to Music, ringer, alarms (silences phone)
authorMichael Chan <mchan@android.com>
Thu, 17 Dec 2009 21:07:58 +0000 (13:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Dec 2009 21:07:58 +0000 (13:07 -0800)
commit5147794329ee6a6b503ce13dff3dc0a50a355c6d
tree886405f71ff2916c1d9d316f68da4b7341509a67
parentfcea8c0d131e019e4441fa239720a5e4ecf9ed7d
parentc611e5a7c6773f3410f7ba60dc34071f7301ed38
am c611e5a7: b/2334482 Dock string changed to Music, ringer, alarms (silences phone)

Merge commit 'c611e5a7c6773f3410f7ba60dc34071f7301ed38' into eclair-plus-aosp

* commit 'c611e5a7c6773f3410f7ba60dc34071f7301ed38':
  b/2334482 Dock string changed to Music, ringer, alarms (silences phone)
res/values/strings.xml