commit | 7d5e9deaac4ed063d157dda0ec6407f5bf4cc606 | [log] [tgz] |
---|---|---|
author | android-modules-prebuiltdrop <android-modules-prebuiltdrop@google.com> | Thu Aug 05 14:29:57 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 05 14:29:57 2021 +0000 |
tree | 3e30ed37f9ce5fa2fa838763828bd5a588ca7eb1 | |
parent | 49dad6b8e3bc28c0f1a1aa71776576c1221b299f [diff] | |
parent | e43a1b147561bfbf42b1299f04ce195860dd6301 [diff] |
[automerger skipped] DO NOT MERGE Drop prebuilt files to android source tree. am: e43a1b1475 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/15468457 Change-Id: I342b647e81a7532b294ec4e28f2ec5c3ec2c55e1