Merge change I3f4f5f05 into eclair-mr2

* changes:
  cdma tones: Fix Call Waiting Tone in the hash map