commit | 560b018fd9e7c79b040e67785d4fed5dadaea572 | [log] [tgz] |
---|---|---|
author | android-modules-prebuiltdrop <android-modules-prebuiltdrop@google.com> | Thu Jul 15 14:56:25 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 15 14:56:25 2021 +0000 |
tree | 3e30ed37f9ce5fa2fa838763828bd5a588ca7eb1 | |
parent | 681bcc4682d33ca02da670f17942217371350919 [diff] | |
parent | d9482471cbf4d738c412810c967c774df49c4acd [diff] |
[automerger skipped] DO NOT MERGE Drop prebuilt files to android source tree. am: d9482471cb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/15298133 Change-Id: I967bc1288d4b10ff7017eb51a27865655730ab41