| commit | 63134b3aee2143c6df1ae9e2f8e4d516e26a0e2a | [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 | 6f3cdb8117c36cb301b3bd3b75aae7d2f72eb0f5 | |
| parent | 527ed66d413e293f82cf3c5c6a4adb8d09337f86 [diff] | |
| parent | 1537637cc443a48e9afb8091b6f2ce329318f2d7 [diff] |
am 1537637c: am 3294d44b: Add confcall management to SIP calls Merge commit '1537637cc443a48e9afb8091b6f2ce329318f2d7' * commit '1537637cc443a48e9afb8091b6f2ce329318f2d7': Add confcall management to SIP calls