tree 269a73c1e3bc96f2b766250ce304235e6794927a
parent b791d69253449805d0de9f1dbbc400779e27782d
parent b7913e5ee635166a5a6798ce54877dcd5279d66c
author Tyler Gunn <tgunn@google.com> 1462930199 +0000
committer android-build-merger <android-build-merger@google.com> 1462930199 +0000

Merge "Add ability to disable video conferencing." into nyc-mr1-dev am: b4e87abed8
am: b7913e5ee6

* commit 'b7913e5ee635166a5a6798ce54877dcd5279d66c':
  Add ability to disable video conferencing.

Change-Id: I095eeca5abe97d782a01b68f1eb4f55f5ed692d7