Merge commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd' into gingerbread-plus-aosp * commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd': Return display name in SipConnection.getCnapName().
Merge commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd' into gingerbread-plus-aosp * commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd': Return display name in SipConnection.getCnapName().