| commit | 88d3adbd019f9b4ab365e672d7673bde2680c1eb | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 13 18:35:53 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 13 18:35:53 2021 +0000 |
| tree | 8450c0754222816f8a602b0959f5b647a5be7bba | |
| parent | 20a67364ff440c799a8d15e87cdf0baf99bff037 [diff] | |
| parent | 7d74c1954a97e61a86d50d733337490517f1df7e [diff] |
[automerger skipped] DO NOT MERGE Drop prebuilt files to android source tree. am: f121b7a86b -s ours am: 2f2a6267b1 -s ours am: 7d74c1954a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/15977162 Change-Id: Ibd58a60c657d0d15461c47db510602d255f5808a