aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-07-06 03:56:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-07-06 03:56:37 +0000
commitafbb4cb115e57fcb2ed77d3ea08c537415bc4f4a (patch)
tree1cab24f5c6213e40794b612fa7017cf8ea745fb6
parent3ef8b0474fc05c22b2a8bb051632f099d4d558f6 (diff)
parent5f86e9f35a548554ecb90ccb544e152f94b82aa6 (diff)
downloadokhttp-afbb4cb115e57fcb2ed77d3ea08c537415bc4f4a.tar.gz
[automerger skipped] Merge "Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c" into android13-tests-dev am: cfb4611fa4 am: 919f27b79c am: 20ccdf0347 -s ours am: 5f86e9f35a -s ours
am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2646786 Change-Id: I90b6b8e9636ad08a0a24f903888deddcdc969364 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions