tree ba0fa7d828966288b4375441e95c1842107860ac
parent f539b536a034c3b652fdf4f3a7a83441a1ca6b96
parent ce9882b4bcae779691de4913f4c556a5fd0650e5
author Tyler Gunn <tgunn@google.com> 1467856512 +0000
committer android-build-merger <android-build-merger@google.com> 1467856512 +0000

Ensure conference capabilities and properties are set on conf start. am: b00433a0a8
am: ce9882b4bc

Change-Id: I41b3b7268aef935940ba8517292346bfe65b6c45