commit | 9195494fdfe1192a610952a0f8f831a9462b8cb4 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 11:07:16 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 11:07:16 2023 +0000 |
tree | e9924b64a83621683f9ae9bef6a67193a16edc15 | |
parent | d0aa48c20ae72b3df0911f2a65e28b3d9fbe901f [diff] | |
parent | acaec52a90c38a08d838f9e610c5b188935351dd [diff] |
[automerger skipped] Merge "Merge Android 14" into main am: bef4715368 -s ours am: 10139dc6d1 -s ours am: d8f0918496 -s ours am: acaec52a90 -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: Ic0c492e4459af402d965657d8d01233ee6d67541 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>