| commit | 20a67364ff440c799a8d15e87cdf0baf99bff037 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 13 18:34:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 13 18:34:22 2021 +0000 |
| tree | 8450c0754222816f8a602b0959f5b647a5be7bba | |
| parent | 4346c2ce54220b71916d23f98ea66b9ff91fa3a5 [diff] | |
| parent | 46802ccbde2e6687abdd91b9baa5e0fdf49fcae6 [diff] |
[automerger skipped] DO NOT MERGE Drop prebuilt files to android source tree. am: f121b7a86b am: 978cb71ee2 -s ours am: 46802ccbde -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: Ic5625c69beb00447c7a0c14913266a1cb706c2cc