OSDN Git Service

am 51477943: am c611e5a7: b/2334482 Dock string changed to Music, ringer, alarms...
authorMichael Chan <mchan@android.com>
Thu, 17 Dec 2009 21:09:14 +0000 (13:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Dec 2009 21:09:14 +0000 (13:09 -0800)
commit8d716fad40f573856a6efe18913828af24833801
treea0fb92d032151a58dce2eb6023bf568575ba5873
parent51f99283c65ff1f0c38dcd0bab2852b949a8d848
parent5147794329ee6a6b503ce13dff3dc0a50a355c6d
am 51477943: am c611e5a7: b/2334482 Dock string changed to Music, ringer, alarms (silences phone)

Merge commit '5147794329ee6a6b503ce13dff3dc0a50a355c6d'

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