am e894ff7a: am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread

Merge commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38'

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