aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-05Snap for 11178562 from a42d72d7beaf8a5ebf056f0f0f1fb21145996ee8 to ↵aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300android14-mainline-art-releaseAndroid Build Coastguard Worker
mainline-art-release Change-Id: Ie4e7cd04a7ae6a41148b9aab334a373a892918e3
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-1948a3eb71fe4b7194b23286bdd98274" into android13-tests-dev am: 4a68010d02 -s ours am: 0d70d6bbfc -s ours am: 0cc60adaa4 -s ours am: 51f0374c4e -s ours am: c81fc006b2 -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/+/2831790 Change-Id: Id21f061f56e362a5bbaf5c3601f42c4180665bc6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-9c2da1b757324288949b43f201c4a0f5" into android12L-tests-dev am: d18fec2189 -s ours am: c7a13ab7fb -s ours am: 919bf93dd3 -s ours am: 5d5bcb6c40 -s ours am: 4e7ae5b96f -s ours am: 15bec017c0 -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/+/2831790 Change-Id: I628a8876a0559e63bb67c3bec884924dc99e4456 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-1948a3eb71fe4b7194b23286bdd98274" into android13-tests-dev am: 4a68010d02 -s ours am: 0d70d6bbfc -s ours am: 0cc60adaa4 -s ours am: 51f0374c4e -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/+/2831790 Change-Id: Iac3371070244ff8c4282d5654d23fbadd3635794 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-9c2da1b757324288949b43f201c4a0f5" into android12L-tests-dev am: d18fec2189 -s ours am: c7a13ab7fb -s ours am: 919bf93dd3 -s ours am: 5d5bcb6c40 -s ours am: 4e7ae5b96f -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/+/2831790 Change-Id: I6d943c0f1e6b99809ddfe88ca70d94d58f652389 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-1948a3eb71fe4b7194b23286bdd98274" into android13-tests-dev am: 4a68010d02 -s ours am: 0d70d6bbfc -s ours am: 43969c8699 -s ours am: 248dd3882e -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/+/2831790 Change-Id: Ieddfb7bcbfe3dd460adcdfb7b8831f2e06d58dd3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-9c2da1b757324288949b43f201c4a0f5" into android12L-tests-dev am: d18fec2189 -s ours am: c7a13ab7fb -s ours am: 919bf93dd3 -s ours am: fa1f666683 -s ours am: aff2e3885b -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/+/2831790 Change-Id: Ic984c5a29ff31b188f353273e4c500e29b740d54 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-1948a3eb71fe4b7194b23286bdd98274" into android13-tests-dev am: 4a68010d02 -s ours am: 0d70d6bbfc -s ours am: 43969c8699 -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/+/2831790 Change-Id: I91135c1ccb5188e449bf89ef21a145045ced7fcb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-9c2da1b757324288949b43f201c4a0f5" into android12L-tests-dev am: d18fec2189 -s ours am: c7a13ab7fb -s ours am: 919bf93dd3 -s ours am: fa1f666683 -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/+/2831790 Change-Id: I1dfd53ecc1359b580050070afaeed3fbb47bdd60 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-901da30cdf7b4b9f971df8132dfa25d2" into android14-tests-dev am: 464a845d6b -s ours am: a8b7cedd0b -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/+/2831790 Change-Id: I22ac75c5c1a97e87ab4591c787397984d19ddcc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-1948a3eb71fe4b7194b23286bdd98274" into android13-tests-dev am: 4a68010d02 -s ours am: 24b220b4f0 -s ours am: cb326c0830 -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/+/2831790 Change-Id: If7ef0752a8d941dfd8e5033abed6f9d47bb1cfc4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-1948a3eb71fe4b7194b23286bdd98274" into android13-tests-dev am: 4a68010d02 -s ours am: 0d70d6bbfc -s ours am: 0cc60adaa4 -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/+/2831790 Change-Id: I60eedaebd1356d495679e240aff9ef2b6277152e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-9c2da1b757324288949b43f201c4a0f5" into android12L-tests-dev am: d18fec2189 -s ours am: c7a13ab7fb -s ours am: 919bf93dd3 -s ours am: 5d5bcb6c40 -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/+/2831790 Change-Id: Idd75fa110f4f0a08b682108d5ee1642dcd0d3ad2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge changes from topic "am-901da30cdf7b4b9f971df8132dfa25d2" into ↵Automerger Merge Worker
android14-tests-dev am: 464a845d6b -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/+/2831790 Change-Id: Ib6cf7307643652212e95fd35dc0605948f249bc3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-1948a3eb71fe4b7194b23286bdd98274" into android13-tests-dev am: 4a68010d02 -s ours am: 24b220b4f0 -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/+/2831790 Change-Id: I1a7437bad5205f6d0f5a978643d88b21b1152b3c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-1948a3eb71fe4b7194b23286bdd98274" into android13-tests-dev am: 4a68010d02 -s ours am: 0d70d6bbfc -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/+/2831790 Change-Id: Ib81cc4b11b6066307e14079a9ffa63878d875d3f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-9c2da1b757324288949b43f201c4a0f5" into android12L-tests-dev am: d18fec2189 -s ours am: c7a13ab7fb -s ours am: 919bf93dd3 -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/+/2831790 Change-Id: I4ad51310d96ce2fcd43dfb3390e65e0bc05b04fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-1948a3eb71fe4b7194b23286bdd98274" into android13-tests-dev am: 4a68010d02 -s ours am: 0d70d6bbfc -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/+/2831790 Change-Id: I19834531902246126717a319b739bc49e2fbc7c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-9c2da1b757324288949b43f201c4a0f5" into android12L-tests-dev am: d18fec2189 -s ours am: c7a13ab7fb -s ours am: 919bf93dd3 -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/+/2831790 Change-Id: Iff9e1b9a52ae58888a6c8425a57fa3c79341cfb3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge changes from topic "am-901da30cdf7b4b9f971df8132dfa25d2" into ↵android14-tests-devAutomerger Merge Worker
android14-tests-dev * changes: Merge changes from topic "am-1948a3eb71fe4b7194b23286bdd98274" into android13-tests-dev am: 4a68010d02 -s ours [automerger skipped] Merge changes from topic "am-9c2da1b757324288949b43f201c4a0f5" into android12L-tests-dev am: d18fec2189 -s ours am: c7a13ab7fb -s ours
2023-11-16Merge changes from topic "am-1948a3eb71fe4b7194b23286bdd98274" into ↵Automerger Merge Worker
android13-tests-dev am: 4a68010d02 -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/+/2831790 Change-Id: I92bd74df276a203e4b0276f38e61b109a7ed1f9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-9c2da1b757324288949b43f201c4a0f5" into android12L-tests-dev am: d18fec2189 -s ours am: c7a13ab7fb -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/+/2831790 Change-Id: Id23876ebe320751a4a780e6c9c2b99a3a9c45a5a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge changes from topic "am-1948a3eb71fe4b7194b23286bdd98274" into ↵Automerger Merge Worker
android13-tests-dev am: 4a68010d02 -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/+/2831790 Change-Id: Iae21e19a794670f76e063db9a06682e4cf9927f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-9c2da1b757324288949b43f201c4a0f5" into android12L-tests-dev am: d18fec2189 -s ours am: c7a13ab7fb -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/+/2831790 Change-Id: Idec4641aedfbaf2af9ee8a6d7cea9e5ce23581e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge changes from topic "am-1948a3eb71fe4b7194b23286bdd98274" into ↵android13-tests-devAutomerger Merge Worker
android13-tests-dev * changes: Merge changes from topic "am-9c2da1b757324288949b43f201c4a0f5" into android12L-tests-dev am: d18fec2189 -s ours [automerger skipped] Merge changes from topic "am-334b06d70b954d08ab75e0cbb80c0c95" into android12-tests-dev am: d25c162ac6 -s ours am: 1c91db4bea -s ours
2023-11-16Merge changes from topic "am-9c2da1b757324288949b43f201c4a0f5" into ↵Automerger Merge Worker
android12L-tests-dev am: d18fec2189 -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/+/2831790 Change-Id: Ib3c3b2fc0b04ef6c4f4037ba970cb393f0d8ca89 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-334b06d70b954d08ab75e0cbb80c0c95" into android12-tests-dev am: d25c162ac6 -s ours am: 1c91db4bea -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/+/2831790 Change-Id: Ib0e7a7dc8f708e757ceb8529bb9dfec9f20eb768 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge changes from topic "am-9c2da1b757324288949b43f201c4a0f5" into ↵android12L-tests-devAutomerger Merge Worker
android12L-tests-dev * changes: Merge changes from topic "am-334b06d70b954d08ab75e0cbb80c0c95" into android12-tests-dev am: d25c162ac6 -s ours [automerger skipped] Merge "Make okhttp tests ambivalent about TLS 1.x." into android11-tests-dev am: b09b3bf8ee -s ours am: 860ca00b85 -s ours
2023-11-16Merge changes from topic "am-334b06d70b954d08ab75e0cbb80c0c95" into ↵Automerger Merge Worker
android12-tests-dev am: d25c162ac6 -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/+/2831790 Change-Id: Ic1304e3238b86363ee48c90fcbd28d48ee6d02f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge "Make okhttp tests ambivalent about TLS 1.x." ↵Treehugger Robot
into android11-tests-dev am: b09b3bf8ee -s ours am: 860ca00b85 -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/+/2831790 Change-Id: I24e1be4d6fdc78c94e919e964740c28590f85559 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge changes from topic "am-334b06d70b954d08ab75e0cbb80c0c95" into ↵android12-tests-devAutomerger Merge Worker
android12-tests-dev * changes: [automerger skipped] Merge "Make okhttp tests ambivalent about TLS 1.x." into android11-tests-dev am: b09b3bf8ee -s ours [automerger skipped] Make okhttp tests ambivalent about TLS 1.x. am: b05d9c427b -s ours
2023-11-16[automerger skipped] Merge "Make okhttp tests ambivalent about TLS 1.x." ↵Treehugger Robot
into android11-tests-dev am: b09b3bf8ee -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/+/2831790 Change-Id: Ic80eacaebb98479972018641a76d801936aefe34 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Make okhttp tests ambivalent about TLS 1.x. am: ↵Pete Bentley
b05d9c427b -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/+/2831790 Change-Id: Ifd5eedcbaabade75295dc99cbb09e4df85fd32be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge "Make okhttp tests ambivalent about TLS 1.x." into android11-tests-devandroid11-tests-devTreehugger Robot
2023-11-15Make okhttp tests ambivalent about TLS 1.x.Pete Bentley
This is intended as a test-only change suitable for backporting to historic CTS branches where vendors may have disabled TLS 1.x. It does add the TLS 1.3 protocol and its ciphers to the relevant enums, which ship in the platform but are not actually used on Android. All Android HttpsURLConnections use a predefined ConnectionSpec defined in HttpsHandler which enables all cipher suites and protocols, i.e. on Android, URL connections are intended to pick up the correct parameters from their socket factory, rather than using the ConnectionSpec API to set them. tl;dr much of the changes are to tests for APIs which are not reachable on Android, but which we should continue to test. Bug: 288058606 Test: atest CtsLibcoreOkHttpTestcases (with and without TLS 1.0/1.1 disabled) Change-Id: I57bd878f25a83763933a453dc6e18c349ed28028 Merged-In: I57bd878f25a83763933a453dc6e18c349ed28028 (cherry picked from commit 77e54e8fb179433aa506b1109127b333bc7a3710) (cherry picked from commit 575eec286b9f1c05eaf2998038f89d60644ededd)
2023-07-07Snap for 10453563 from 527304d57c92232e7c6f9b0ceb962f909d9df8b6 to ↵aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060Android Build Coastguard Worker
mainline-art-release Change-Id: I1a527c0479d28c901d731ba6bc44f970622135c7
2023-07-06[automerger skipped] Merge "Merge "Merge "Make okhttp tests ambivalent about ↵Automerger Merge Worker
TLS 1.x." into android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c" into android13-tests-dev am: cfb4611fa4 am: 919f27b79c am: 65463034d9 am: 129b1e4cea -s ours am: 412bd74c2c -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: Id07cf5cc3ad54bd12dcfd00c99d5b70647f14b1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06[automerger skipped] Merge "Merge "Merge "Make okhttp tests ambivalent about ↵Automerger Merge Worker
TLS 1.x." into android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c" into android13-tests-dev am: cfb4611fa4 am: 919f27b79c am: 65463034d9 am: 129b1e4cea -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: I919496af4fbd257b32476dcaaec1513e76f99fde Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06Merge "Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into ↵Automerger Merge Worker
android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c" into android13-tests-dev am: cfb4611fa4 am: 919f27b79c am: 65463034d9 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2646786 Change-Id: Ibb2b7614ae17102799d6a2cd11b2ae8a8347625a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06[automerger skipped] Merge "Merge "Merge "Make okhttp tests ambivalent about ↵Automerger Merge Worker
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>
2023-07-06Merge "Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into ↵Automerger Merge Worker
android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c" into android13-tests-dev am: cfb4611fa4 am: 61bccd5f97 am: a9f9fd0b21 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2646786 Change-Id: I3979dc4003dc5d9f653385acdb59779b00603c6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06[automerger skipped] Merge "Merge "Merge "Make okhttp tests ambivalent about ↵Automerger Merge Worker
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 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: Ie52e5a423bb5c2dfecad182f487e0745c41f72ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06Merge "Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into ↵Automerger Merge Worker
android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c" into android13-tests-dev am: cfb4611fa4 am: 919f27b79c Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2646786 Change-Id: I0f228ef739e38ab300ec4757f7e2d4780aceae61 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06Merge "Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into ↵Automerger Merge Worker
android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c" into android13-tests-dev am: cfb4611fa4 am: 61bccd5f97 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2646786 Change-Id: Id963c7b6dfd46d5f8f1458949ca6b2438613e4be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06Merge "Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into ↵Automerger Merge Worker
android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c" into android13-tests-dev am: cfb4611fa4 am: 919f27b79c Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2646786 Change-Id: I9198ca5bd972668e037572000af1f99e8c00ef7c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06Merge "Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into ↵android-cts-14.0_r2Automerger Merge Worker
android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c" into android13-tests-dev am: cfb4611fa4 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2646786 Change-Id: Ife778514f97b28c2094680c9314daafa72e11829 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06Merge "Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into ↵Automerger Merge Worker
android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c" into android13-tests-dev am: cfb4611fa4 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2646786 Change-Id: Id992c71bf472ba02dc611cb937e2a60baa3c9b8b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06Merge "Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into ↵Automerger Merge Worker
android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c" into android13-tests-dev
2023-07-06Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into ↵Automerger Merge Worker
android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2646786 Change-Id: Ib28cae2c291da70863de49c294ed86212d0a06a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into ↵Automerger Merge Worker
android12-tests-dev am: ffff5e64a6" into android12L-tests-dev
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 03:28:39 +0000