commit | de0067f73a9d19038141cd5e5b407ce61f602fb9 | [log] [tgz] |
---|---|---|
author | Hung-ying Tyan <tyanh@google.com> | Tue Aug 24 12:58:22 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 24 12:58:22 2010 -0700 |
tree | 9535013ef46bc8c2bb119e23ead0c28f5b894a94 | |
parent | 5e47fe03a461e998b4e6ded608edcd1a428638c7 [diff] | |
parent | 7055d2fc7ec223efeb328a9835bb0ffb04470343 [diff] |
am 1537637c: am 3294d44b: Add confcall management to SIP calls Merge commit '1537637cc443a48e9afb8091b6f2ce329318f2d7' * commit '1537637cc443a48e9afb8091b6f2ce329318f2d7': Add confcall management to SIP calls