commit | d0aa48c20ae72b3df0911f2a65e28b3d9fbe901f | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Fri Oct 06 11:01:15 2023 +0000 |
committer | Automerger Merge Worker <[email protected]> | Fri Oct 06 11:01:15 2023 +0000 |
tree | e9924b64a83621683f9ae9bef6a67193a16edc15 | |
parent | 214f16a4b17e1f8565b926c25a6842cbb4e0cafe [diff] | |
parent | 735657eeb405146d92e6f41bb4e211a979872b28 [diff] |
[automerger skipped] Merge Android 14 am: 3a3d1aca75 -s ours am: a1edc4c2ae -s ours am: 6090504b76 -s ours am: 735657eeb4 -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: I5a6f45c05f710c5a4fb8537533f0d1d79ad4abd9 Signed-off-by: Automerger Merge Worker <[email protected]>