diff options
| author | Pete Bentley <prb@google.com> | 2024-01-31 15:43:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-31 15:43:44 +0000 |
| commit | c20e3b49658640d781f81a77316fe5db83f9edc1 (patch) | |
| tree | 8ab134e2049a6b79929ef764191af32a32c8a7c2 | |
| parent | 57c7bbf8b28ad965736b75f19257b209802fef1e (diff) | |
| parent | 766444dd0a282b0d50fd4fbebdeb13e1b7d162a2 (diff) | |
| download | conscrypt-c20e3b49658640d781f81a77316fe5db83f9edc1.tar.gz | |
[automerger skipped] Merge: Make tests agnostic about TLS v1.x. am: 5dc9cdaf41 -s ours am: e6b1e3af07 -s ours am: 2891cade71 -s ours am: 16c88aaac1 -s ours am: 766444dd0a -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: Id99ad20feb568f093acfd50173fca9ffe89ae7cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions