diff options
author | Pete Bentley <prb@google.com> | 2024-01-31 12:54:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-31 12:54:19 +0000 |
commit | e6b1e3af07b4ddaa97d18577b5e58f7a30aa672c (patch) | |
tree | ca183346d8c0934ed01cee53eb17f931a0e54a25 | |
parent | ef94246894137b7f474829f2ac1f47be623b0c4f (diff) | |
parent | 5dc9cdaf41d6d15ab992ac27a79e556719b0f23e (diff) | |
download | conscrypt-e6b1e3af07b4ddaa97d18577b5e58f7a30aa672c.tar.gz |
[automerger skipped] Merge: Make tests agnostic about TLS v1.x. am: 5dc9cdaf41 -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: I5b82b885023e5c56f32a90f8a5de867ea66118a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions