tree 9234a77ee64705bf5482d8cb708e63a90f252bfa
parent f4cd9be0390135269e22e42fd2e1fe61fdcf9863
parent 538e58fc757b0d10672235bc17b1380854845139
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