tree 48aaf6bf7fe459f6fcced4f73c30f682fcca83db
parent f6619b06eac3f92423dec5a0de9dc79c79325d1e
parent ffcc97937d9e030c142e6703cc87a358739d7e0d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579823281 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579823281 +0000

Merge "Prevent video calls that down graded to audio calls from merging to conference call." am: ffcc97937d

Change-Id: Ic194825e8721a018ef31a60f9545ea59347006e2