| commit | 6ff419d2c38df6589dc977d7f1bb73ba101d3703 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 29 16:44:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 29 16:44:56 2021 +0000 |
| tree | 8450c0754222816f8a602b0959f5b647a5be7bba | |
| parent | 685e3b0b2d446cd2c754233459d246c27635fccd [diff] | |
| parent | 142334a95f0dce395ae8331316f13838161450ee [diff] |
Merge "[automerger skipped] DO NOT MERGE Drop prebuilt files to android source tree. am: bb9c75b205 am: 04d2fac6d4 -s ours" into sc-v2-dev-plus-aosp am: 142334a95f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/15419747 Change-Id: Ib6031cb661bc2771f1fb65e63e3376e0413af8ea