| commit | fbbba2ff1ec7ad9e590a7321bcf65b3cb5991225 | [log] [tgz] |
|---|---|---|
| author | Miguel Aranda <miguelaranda@google.com> | Tue Nov 14 16:35:36 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 14 16:35:36 2023 +0000 |
| tree | 28a625fb9e651ee46188522476e2c844541adc59 | |
| parent | dde328e123787992ab733caefb08ee7cb4fde883 [diff] | |
| parent | 3267dee74586f080165ee854b68432dec1dd7486 [diff] |
Merge "Correct mistaken cherry-pick detail in tls deprecation." into udc-mainline-prod am: 3267dee745 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/conscrypt/+/25370795 Change-Id: I4c172291e9f177f999af58703362cf0782dc5324 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>