| commit | f5d613929a0e620e701db3776fbcb1ebb6925445 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Mon Feb 02 15:52:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 02 15:52:55 2015 +0000 |
| tree | 8078b947055cfdcaa9d44586570c3bc28a1f0d36 | |
| parent | 83d65842e74360c63036521b13b405c26c15583a [diff] | |
| parent | 2f25c1f47c80a37e8df7acd88e5bc3930d5afc82 [diff] |
am 2f25c1f4: Fixing conference merge where only one party is added to conference. * commit '2f25c1f47c80a37e8df7acd88e5bc3930d5afc82': Fixing conference merge where only one party is added to conference.