commit | 3b9afcdee81e0f6e363c3843c026fa0000fb4a99 | [log] [tgz] |
---|---|---|
author | Josh Hou <[email protected]> | Tue Dec 08 02:50:02 2020 +0000 |
committer | Automerger Merge Worker <[email protected]> | Tue Dec 08 02:50:02 2020 +0000 |
tree | ff29f2244094f38a0422d67bc89530a1cbae661f | |
parent | 02598a61ff37bd955fe260822db01ca9aee5a932 [diff] | |
parent | afce5abdd0afc625c63a426192d91f37a291e2b0 [diff] |
[automerger skipped] Merge "Handle P-Associated-Uris which are SIP uris in conference host check." into rvc-qpr-dev am: 9cfac9c44c am: afce5abdd0 -s ours am skip reason: Change-Id I72038fd3fbe418f9d5d026a2fae688bc0d381531 with SHA-1 32aac3e827 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/13155657 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7e9f6931ef1d873f2026665fa9d2aba6678078ec