tree e9924b64a83621683f9ae9bef6a67193a16edc15
parent a1edc4c2aeefca3af44ef661dd67632b01fcb8f0
parent bef47153681f46df3f5712de0fd1db4885b3b021
author Xin Li <delphij@google.com> 1696579129 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696579129 +0000

[automerger skipped] Merge "Merge Android 14" into main am: bef4715368 -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: I6c278a88ac4938a88b4f5ed2bd11a453f1f0c297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>