OSDN Git Service

am 694e8662: am 5f69f726: Merge change I3f4f5f05 into eclair-mr2
authorNaveen Kalla <nkalla@quicinc.com>
Wed, 25 Nov 2009 17:48:34 +0000 (09:48 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Nov 2009 17:48:34 +0000 (09:48 -0800)
Merge commit '694e8662a51bd878cd5630d47adaace471ea6f7c'

* commit '694e8662a51bd878cd5630d47adaace471ea6f7c':
  cdma tones: Fix Call Waiting Tone in the hash map


Trivial merge