am 104d3f75: Merge change I6c84d731 into eclair-mr2

Merge commit '104d3f755e5ebc15d66154526c2c149beb33a7ee' into eclair-mr2-plus-aosp

* commit '104d3f755e5ebc15d66154526c2c149beb33a7ee':
  Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER