tree e9924b64a83621683f9ae9bef6a67193a16edc15
parent 735657eeb405146d92e6f41bb4e211a979872b28
parent d8f0918496cdca916c086e10a65b7e1c62abc297
author Xin Li <delphij@google.com> 1696586247 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696586247 +0000

[automerger skipped] Merge "Merge Android 14" into main am: bef4715368 -s ours am: 10139dc6d1 -s ours am: d8f0918496 -s ours

am skip reason: Merged-In I02c9eb59eabf16a5b862ae78670d31db6e1fc15f with SHA-1 572bfdb038 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2776760

Change-Id: Id4ac9147d747363fcbd78de603906bae89e984db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>