tree 88f7337103dd0bf648d98315961ddcfbdc791a35
parent adbce93795c21f6cac8006fb697578aebb75a171
parent 0e7235b00fdf47c773592a324c4a62ef95d1dcf4
author Michael Chan <mchan@android.com> 1256839494 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256839494 -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-plus-aosp

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