| commit | 8f4be068d3c370a03c22d2160fdc819a4e9ca628 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Wed Nov 05 18:47:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 05 18:47:50 2014 +0000 |
| tree | 526c4b399a2dc97178668ee227782de2cfc1f20e | |
| parent | 183455b02aa802353dea89b7277ccd74d561d54e [diff] | |
| parent | d331e4ec260df97e646c8481b6aba3c2e54d0555 [diff] |
am d331e4ec: Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev automerge: 4255ec5 automerge: 0bfb97c * commit 'd331e4ec260df97e646c8481b6aba3c2e54d0555': Support disconnecting conference participants from conference.