OSDN Git Service

am f345a094: am 104d3f75: Merge change I6c84d731 into eclair-mr2
authorNaveen Kalla <nkalla@quicinc.com>
Fri, 4 Dec 2009 12:32:33 +0000 (04:32 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Dec 2009 12:32:33 +0000 (04:32 -0800)
commit7570576e7d681db3256ea5d0934883920f545bf3
tree7f91ff8cb09a0f756e7a499a8f80f38f2c6c90be
parent95f118e46a1ef9661eb152fe304a98f0cab18741
parentf345a094e90be664f7390d12d505a052ac4b064f
am f345a094: am 104d3f75: Merge change I6c84d731 into eclair-mr2

Merge commit 'f345a094e90be664f7390d12d505a052ac4b064f'

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