tree d9fec1cd2a6c53e5e7f3489d4870b25c987b5ca3
parent 40fb5584dbe3f9b5c23d06086d1f13cffc802074
parent e6b1e3af07b4ddaa97d18577b5e58f7a30aa672c
author Pete Bentley <prb@google.com> 1706708154 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1706708154 +0000

[automerger skipped] Merge: Make tests agnostic about TLS v1.x. am: 5dc9cdaf41 -s ours am: e6b1e3af07 -s ours

am skip reason: Merged-In If8c48afcd1a6a417d1410ce4335f16cac3abd191 with SHA-1 d075ab478a is already in history

Original change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/2923169

Change-Id: I84352260568c91b4eaa2868b6a7e991c1bfed967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>