Hung-ying Tyan 821f087989 am fd0ba81c: am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread ...

Merge commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d'

* commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d':
  Silently reject a ringing call when another call is dialing/ringing.

2010-10-21 10:56:02 -07:00

..

android/telephony

am bd6d5098: am d07833f5: Don\'t manually create CallerInfo objects from SipPhone

2010-10-11 17:48:47 -07:00

com/android/internal/telephony

am fd0ba81c: am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread

2010-10-21 10:56:02 -07:00