commit | 2cef210f53ac9ca5471e87fa02db252442448b7d | [log] [tgz] |
---|---|---|
author | Hung-ying Tyan <tyanh@google.com> | Thu Oct 21 13:43:43 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 21 13:43:43 2010 -0700 |
tree | bf85d66098e35479ccf97004857d6f51b23cebcb | |
parent | c2238d006237ebf1296074d80fb4f4a2741ef880 [diff] | |
parent | 940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8 [diff] |
am 940b4d1c: am 6037a056: Fix n-way conf call in SipPhone. Merge commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8' * commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8': Fix n-way conf call in SipPhone.