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

Merge commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38'

* commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38':
  Return display name in SipConnection.getCnapName().
tree: 098417931546946efcd3ae0cd964b2d743dc5d89
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE