| commit | f336efc8bcd0e2a30e97f7db85ed69660c9d8b1e | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <[email protected]> | Mon Feb 02 15:56:26 2015 +0000 |
| committer | Android Git Automerger <[email protected]> | Mon Feb 02 15:56:26 2015 +0000 |
| tree | 736fcc8d271a4dd0895349da087a25c6f9c83a82 | |
| parent | a1fb26f2644b702ff6919f1472709009cb585e62 [diff] | |
| parent | f5d613929a0e620e701db3776fbcb1ebb6925445 [diff] |
am f5d61392: am 2f25c1f4: Fixing conference merge where only one party is added to conference. * commit 'f5d613929a0e620e701db3776fbcb1ebb6925445': Fixing conference merge where only one party is added to conference.