| commit | 3ab6c6d62cab78b1c047769f0cdac8eb6c0f050d | [log] [tgz] |
|---|---|---|
| author | android-modules-prebuiltdrop <android-modules-prebuiltdrop@google.com> | Tue Aug 03 14:38:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 03 14:38:12 2021 +0000 |
| tree | 8450c0754222816f8a602b0959f5b647a5be7bba | |
| parent | 6ff419d2c38df6589dc977d7f1bb73ba101d3703 [diff] | |
| parent | f868ca3e38350cc959824877d8c1d5f155eb40d0 [diff] |
[automerger skipped] DO NOT MERGE Drop prebuilt files to android source tree. am: c5ef378e01 am: f868ca3e38 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/15452955 Change-Id: I5126d2ebc8649444fbccf67a0f4fada0f12f93b1