| commit | 5b177a6b5f9d8a9aa3f4d1877de521c30ba42e57 | [log] [tgz] |
|---|---|---|
| author | Santos Cordon <santoscordon@google.com> | Fri Nov 07 17:42:18 2014 -0800 |
| committer | Santos Cordon <santoscordon@google.com> | Fri Nov 07 17:42:18 2014 -0800 |
| tree | 90b66d8e758b8c7af5d7437dbf445dd7a3df2ca0 | |
| parent | 2ccd0ac6a7c22e413733bf24c7c04e835445ab65 [diff] |
Calculate conferenceable after conference. We need to calculate conference children before calculating conferenceability. Without doing this, a conference was in a scenario where it was conferenceable with one of it's children and the ui showed merge when it should not have. Bug: 18285352 Change-Id: I67861003f98cf77fae5b7071c73609e0ef3dd5cb