commit | 36eecfcb65a2faa18855d19c391a0d66d3af8cd5 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Dec 11 21:16:42 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 11 21:16:42 2023 +0000 |
tree | 712944556a2dc216d6474ddbd95d9b8736ef114f | |
parent | 98ed760a5d1bcbf75d5d9a1806f1df5cc09e190b [diff] | |
parent | 2ffa932ec65f644861dede3329ef0485ab6e6e03 [diff] |
[automerger skipped] Merge Android 14 QPR1 am: 2ffa932ec6 -s ours am skip reason: Merged-In I93b2d84b45b078de9543a181876d53a8dd95b49e with SHA-1 98ed760a5d is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/2863580 Change-Id: Ie3db69e652e19d17ee9a4fdc92592e08c604e894 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>