| commit | 11831e903091c40ad6f066cc17239d86d348c5fc | [log] [tgz] |
|---|---|---|
| author | Dario Freni <dariofreni@google.com> | Fri Jul 23 18:50:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 23 18:50:14 2021 +0000 |
| tree | 3e30ed37f9ce5fa2fa838763828bd5a588ca7eb1 | |
| parent | fa1ef65c69d6e2480e7d092fda97b0b60eb139a3 [diff] | |
| parent | 0ce0f77e0a1443cd3dc7a09e45eb40a51c2a5600 [diff] |
[automerger skipped] DO NOT MERGE Update Android.bp am: 0ce0f77e0a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/15371873 Change-Id: Ia9fe1b0b79d57cd055ef64404c893a9df6d1ba94