OSDN Git Service

Merge "Return display name in SipConnection.getCnapName()." into gingerbread
authorHung-ying Tyan <tyanh@google.com>
Wed, 20 Oct 2010 06:00:16 +0000 (23:00 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 20 Oct 2010 06:00:16 +0000 (23:00 -0700)

Trivial merge