| commit | 92ac9748da6d95f4b3b31d029679e92048cf45d3 | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Thu Nov 25 11:13:58 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 25 11:13:58 2021 +0000 |
| tree | c94ad78cedc16a545e7c1c619b3b2724ec83f709 | |
| parent | 7895e3333a3e5b91a32587451442722871364ea8 [diff] | |
| parent | 5f98f42b5928e7cfd7300414b58c75d36bb40819 [diff] |
[automerger skipped] DO NOT MERGE: Enable Prebuilt SDK am: 41bb70dd99 -s ours am: 5f98f42b59 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/16297605 Change-Id: I873249286b57c76e03d989f0ecddaf4afc9221c8