tree 914b8e33d92ead122a69913c56d079e70968b482
parent f19893143519554a8f678956014444fc4e3559e6
parent 209cb1e451aca74f9d4b734f050b1ec3b9f305a9
author Tyler Gunn <tgunn@google.com> 1441815116 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441815116 +0000

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

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