tree eed4f5fe7e9e6ed264794de4a2f60c17829a4830
parent e654572d54a3c5ef8a7a79c67ff4f59be729e3d4
parent 6c9760c521fb1990c88ff97031fc300eafe90ae4
author Pankaj Kanwar <pkanwar@google.com> 1468605423 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1468605423 +0000

Merge "Ensure conference doesn't support video if video conf not supported." into nyc-mr1-dev