tree 13d966f8f54a4415621ce0abbf53c3a094661c66
parent 5c579f30195de370150b68282c61c0e207f98568
parent ea9538d8cf21aa542235854deb8caadeac746f44
author Michael Chan <mchan@android.com> 1256871612 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256871612 -0700

am ea9538d8: am 0e7235b0: b/2194249 Prevent Calendar from playing multiple notification tones around the same time. This is a safe but temp fix for overlapping ringtones playing at the same time.

Merge commit 'ea9538d8cf21aa542235854deb8caadeac746f44' into eclair-mr2-plus-aosp

* commit 'ea9538d8cf21aa542235854deb8caadeac746f44':
  b/2194249 Prevent Calendar from playing multiple notification tones around the same time.