commit | 09a1df6580350b6dfcded1d06958093c3ae68c8b | [log] [tgz] |
---|---|---|
author | Tyler Gunn <tgunn@google.com> | Fri Jul 15 18:04:11 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 15 18:04:11 2016 +0000 |
tree | 6d28ecf66ddbbb29468608e69c35ae54b8f0852f | |
parent | 09398dfaa30b77f331a1f2fe7a3be47c59bc8b53 [diff] | |
parent | 66b39eabbe1c0a08a8a5da2d23c97c38c6a59896 [diff] |
Merge \"Ensure conference doesn\'t support video if video conf not supported.\" into nyc-mr1-dev am: 66b39eabbe Change-Id: Iebced499505e18e33fde9da3641b0efa35d8d982