tree dc19cf0f0942955e911047ca167f8a7ce5341614
parent 3a913ac1254c994b79cb023304d65b0c782764f5
parent 09a1df6580350b6dfcded1d06958093c3ae68c8b
author Pankaj Kanwar <pkanwar@google.com> 1468606515 +0000
committer android-build-merger <android-build-merger@google.com> 1468606515 +0000

Merge \\"Ensure conference doesn\\'t support video if video conf not supported.\\" into nyc-mr1-dev am: 66b39eabbe
am: 09a1df6580

Change-Id: Ia3079b04d63446c35e4397e2eb0c3f2c9f4f6bf9