Hung-ying Tyan 4e00a8d582 am e894ff7a: am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread ...

Merge commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38'

* commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38':
  Return display name in SipConnection.getCnapName().

2010-10-21 10:53:49 -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 e894ff7a: am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread

2010-10-21 10:53:49 -07:00