tree 1e0adcf49be56013329d1c444a9ff213163776ee
parent 44ef50398c8d48d1601a894cc0aacafad30da9fc
parent b4e87abed818cb66a0e996cfbed246cb2723c77c
author Tyler Gunn <tgunn@google.com> 1462929902 +0000
committer android-build-merger <android-build-merger@google.com> 1462929902 +0000

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

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

Change-Id: I029efdb162a8a5e546083c4f227fe5829336c612