tree bdae75dacc3998b7e7806075f3e543be78ec74db
parent 5f0cdc8c546052ebf1052ea573031b933093bbf5
parent 24768533183fdef90c7e6b88d7c25a0ac8e1c9d5
author Hall Liu <hallliu@google.com> 1555467018 -0700
committer android-build-merger <android-build-merger@google.com> 1555467018 -0700

Merge "Make connection events work for conferences"
am: 2476853318

Change-Id: Ibf8cba94e6ba386f57e5b1967bbb539c2d665f4d