| commit | 5f98f42b5928e7cfd7300414b58c75d36bb40819 | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Thu Nov 25 10:57:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 25 10:57:18 2021 +0000 |
| tree | 9bbd29b120d87025026302b46dfbb0017c459b2d | |
| parent | 7236337172e9ffd24471091746f60cf13ec67dc1 [diff] | |
| parent | 41bb70dd992970279f8e6a52d4dc30f67d1a17e0 [diff] |
[automerger skipped] DO NOT MERGE: Enable Prebuilt SDK am: 41bb70dd99 -s ours am skip reason: Merged-In I880b3d89db7dd0dc0f886316d37f6beb3a0d5863 with SHA-1 7236337172 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/16297605 Change-Id: Ia2b3dc5db33a75fcffdd94c725693f4e7ef3be9a