tree e9924b64a83621683f9ae9bef6a67193a16edc15
parent 6090504b76f97de2a68725d64672168988fbca14
parent 10139dc6d1e0d4d2d5ae536a358cfacb3a0e69f9
author Xin Li <delphij@google.com> 1696583144 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696583144 +0000

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