| commit | 0a629912dd9809a0993321176293d73fd487d710 | [log] [tgz] |
|---|---|---|
| author | Mathew Inwood <mathewi@google.com> | Tue Jun 29 16:35:46 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 29 16:35:46 2021 +0000 |
| tree | e7c91c7e11b8a3af45982cb8d7e93079ae44ebba | |
| parent | 3ac66f8a729c49e66982109c3c6711701c3379bb [diff] | |
| parent | 38e22a3feda028c073268a8345f9fd252d5a815d [diff] |
[automerger skipped] Drop prebuilt files to android source tree. am: 38e22a3fed -s ours am skip reason: Merged-In I03d0830c7d5e61bc412a2b517dba1ee9ee23e7f5 with SHA-1 869dac113f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/15126996 Change-Id: I52d1f89f2bb6d1096308233a8d84535043d42306