tree bcaea04c6d95369bccb529e893bfed99c2dd15aa
parent 374263a6d49759603078160f80b6e0a3163456dc
parent 13fabef5ede2aee719f7cc758057485c130cb0f1
author Treehugger Robot <treehugger-gerrit@google.com> 1599097533 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599097533 +0000

Merge "Ensure video provider is set on ImsConference from host connection." am: ce83506f27 am: 6f4238d7a3 am: c0cc8fe42b am: a3191544e7 am: 13fabef5ed

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1410389

Change-Id: I97b2def5dda65585573effdcb34ff2895b5f284b