am 5f69f726: Merge change I3f4f5f05 into eclair-mr2

Merge commit '5f69f7260ff34b2bed7cc3309f91b750f1a833d3' into eclair-mr2-plus-aosp

* commit '5f69f7260ff34b2bed7cc3309f91b750f1a833d3':
  cdma tones: Fix Call Waiting Tone in the hash map