OSDN Git Service

am bb3bb57a: Merge change I524dc046 into eclair
authorEric Laurent <elaurent@google.com>
Wed, 2 Dec 2009 01:04:24 +0000 (17:04 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Dec 2009 01:04:24 +0000 (17:04 -0800)
commit5e392e2b028fb0f92b2efe6de24b60a57cd4c565
treec7ef2f4d75ff6fb8975acb89be3f64dfa4bc01f4
parentcf98f4268cc70228ef49350f1ccef1266f2e3cf8
parentbb3bb57a6330f71323fcd7e93e88dbdab55daec3
am bb3bb57a: Merge change I524dc046 into eclair

Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-mr2

* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
media/java/android/media/Ringtone.java
services/java/com/android/server/NotificationManagerService.java