commit | 8f33575cf4c00128c4c2e391b36a5cb269162d93 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Dec 11 22:02:31 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 11 22:02:31 2023 +0000 |
tree | 712944556a2dc216d6474ddbd95d9b8736ef114f | |
parent | 1b16dabce677304fb36756d1634d71dddd971c05 [diff] | |
parent | 36eecfcb65a2faa18855d19c391a0d66d3af8cd5 [diff] |
[automerger skipped] Merge Android 14 QPR1 am: 2ffa932ec6 -s ours am: 36eecfcb65 -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: I7668789652a8758bd00dd6cc15dd40a9dfead634 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>