commit | 553826bafa377e917d6ce1c8b402a0c30a3eaa4a | [log] [tgz] |
---|---|---|
author | android-modules-prebuiltdrop <android-modules-prebuiltdrop@google.com> | Thu Jul 29 16:14:52 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 29 16:14:52 2021 +0000 |
tree | 3e30ed37f9ce5fa2fa838763828bd5a588ca7eb1 | |
parent | db5b30b61c93be1accab36bfb7bb5d3bb71ce1d0 [diff] | |
parent | bb9c75b20566dfaea0bc1d9a929ebe5cea7e34ad [diff] |
[automerger skipped] DO NOT MERGE Drop prebuilt files to android source tree. am: bb9c75b205 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/15419747 Change-Id: If389aebed92b62637c4049c33046cd66c529dc0e