tree 3b4d087fab5af7252313a5052bd7fb05f4d89469
parent 3daf05e4414635f9b28195eb508de77967dccd4d
parent d28f0c8c78a8aac37ae7e66d4a737f8ed45aecf7
author Tyler Gunn <tgunn@google.com> 1559342921 -0700
committer android-build-merger <android-build-merger@google.com> 1559342921 -0700

Merge "Enhancements to conference for non-conference host scenarios." into qt-dev
am: d28f0c8c78

Change-Id: I01700637f72e3542810353a709bfe10bf5aff276