| commit | 047d8101113030f34f89f7c9ba015d6c5c3abba6 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Fri Jan 30 15:21:11 2015 -0800 |
| committer | Tyler Gunn <tgunn@google.com> | Fri Jan 30 15:21:11 2015 -0800 |
| tree | 5e0fa74f3c14499514c1463e804f3f013e735045 | |
| parent | b5388a368811eb39ba2f25f1266208b72e62f280 [diff] |
Fixing conference merge where only one party is added to conference. - revisit code to trigger processMergeComplete; we used to assume that we were done merging when the transient session started. We now have to check on terminate and on hold to see if all the calls have been Bug: 18960042 Change-Id: I682303558c6958d85d2358102757608041b8451e