tree 13d966f8f54a4415621ce0abbf53c3a094661c66
parent fa31dd93ca69f1ba058c82f34fe56f60badf50c3
parent 0e7235b00fdf47c773592a324c4a62ef95d1dcf4
author Michael Chan <mchan@android.com> 1256869686 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256869686 -0700

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 '0e7235b00fdf47c773592a324c4a62ef95d1dcf4' into eclair-mr2

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