Merge commit 'f345a094e90be664f7390d12d505a052ac4b064f' * commit 'f345a094e90be664f7390d12d505a052ac4b064f': Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
Merge commit 'f345a094e90be664f7390d12d505a052ac4b064f' * commit 'f345a094e90be664f7390d12d505a052ac4b064f': Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER