| commit | d398b999007892a5e6a952461e9b7c7f5b219cc8 | [log] [tgz] |
|---|---|---|
| author | Dario Freni <dariofreni@google.com> | Thu Oct 28 20:41:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 28 20:41:36 2021 +0000 |
| tree | 8450c0754222816f8a602b0959f5b647a5be7bba | |
| parent | 88d3adbd019f9b4ab365e672d7673bde2680c1eb [diff] | |
| parent | 8136a6cfd5adf813fe5a73b91e8e730fe8793a28 [diff] |
[automerger skipped] DO NOT MERGE Update Android.bp am: de91642c2a am: 8136a6cfd5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/16124533 Change-Id: I5382a0e245c9cc33bb52a00315300c79aed40e99