| commit | 77c733746a3856a606775a4b05a0a1c5bb3cf6ed | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Mon Feb 02 18:09:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 02 18:09:47 2015 +0000 |
| tree | c029f7c17a91a9ff57b1de03c1b97e18c2ef574c | |
| parent | 025d013b32914c8e0fd7b4ff8186aaab297a7ca2 [diff] | |
| parent | f336efc8bcd0e2a30e97f7db85ed69660c9d8b1e [diff] |
am f336efc8: am f5d61392: am 2f25c1f4: Fixing conference merge where only one party is added to conference. * commit 'f336efc8bcd0e2a30e97f7db85ed69660c9d8b1e': Fixing conference merge where only one party is added to conference.