tree 3414ca5b77346b089cde299d96eb3c4a41c13ae8
parent 48a12b2c91830dc74516985b0e34065a73c37527
parent 6f4238d7a386cafa5369e6c14dbf8cae7f5aa7d7
author Treehugger Robot <treehugger-gerrit@google.com> 1599090922 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599090922 +0000

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

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

Change-Id: I1974f30bb376ba9b29eca42be8494b70881fd5bc