tree 13b18eb40b59a18e13afdc32a5946c116e85f4e7
parent b0da44e0e73834611841dda3d23172f58e4dc775
parent 3871c68210a0743623052f82c62184209d6e5e89
author Treehugger Robot <treehugger-gerrit@google.com> 1604538612 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604538612 +0000

Merge "Handle P-Associated-Uris which are SIP uris in conference host check." am: 0faea3bf7d am: 3871c68210

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

Change-Id: Iab9c13e98623fa0df1c68a402ba06c23a112beed