Hung-ying Tyan 88b4bd5f3e am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread ...

Merge commit 'fc7e7766e7d6a49d31426f821c0a56168c0d75cc' into gingerbread-plus-aosp

* commit 'fc7e7766e7d6a49d31426f821c0a56168c0d75cc':
  CallManager/SipPhone: fix reject a ringing call

2010-10-05 18:37:14 -07:00

..

android/telephony

am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread

2010-09-14 15:05:53 -07:00

com/android/internal/telephony

am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread

2010-10-05 18:37:14 -07:00