commit | 92e8eaa7ff670e584a61efbc7cac81360d7e1a80 | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Sat Oct 07 00:26:48 2023 +0000 |
committer | Automerger Merge Worker <[email protected]> | Sat Oct 07 00:26:48 2023 +0000 |
tree | e9924b64a83621683f9ae9bef6a67193a16edc15 | |
parent | ff6f679428a3a3a4e754a0ce6ed504579c12f298 [diff] | |
parent | 9195494fdfe1192a610952a0f8f831a9462b8cb4 [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: 9195494fdf -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: I58f51d534e68a3f76ae8ca68f16fb670bb9015a3 Signed-off-by: Automerger Merge Worker <[email protected]>