tree 1e63940048601017c220350a53d3954ed54628cd
parent c99bf7facbd169c021384ab11b732b42a2890e7f
parent ecbdead1736bd894d58686a237a87f7f8b991627
author Tyler Gunn <tgunn@google.com> 1441815629 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441815629 +0000

am ecbdead1: am 209cb1e4: Merge "Fix issue where host shows up as a conference participant." into mnc-dr-dev

* commit 'ecbdead1736bd894d58686a237a87f7f8b991627':
  Fix issue where host shows up as a conference participant.