tree 2be6180be2c505895805cf583c10f2640c03b8af
parent 1aedd5613e223409dafb0940cf05f2d8c31886fc
parent 5522e5f34cb2489647940926d9828aa0f038d854
author Hung-ying Tyan <tyanh@google.com> 1287554416 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1287554416 -0700

Merge "Return display name in SipConnection.getCnapName()." into gingerbread