aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-04-11Merge "Disable flakey okhttp tests pending investigation." into mainHEADmastermainTreehugger Robot
2024-04-11Disable flakey okhttp tests pending investigation.Pete Bentley
Bug: 333847678 Test: atest CtsLibcoreOkHttpTestCases Change-Id: Ibd5025776c517463198009a3b53bf83dd08b790c
2024-02-05Merge "[DON'T BLOCK] Test ownership migration rules" into main am: bde6760fd1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2950606 Change-Id: I3ed51a45c2d655985a22be5145c8ac78aa3f8670 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-05Merge "[DON'T BLOCK] Test ownership migration rules" into mainTreehugger Robot
2024-02-05[DON'T BLOCK] Test ownership migration rulesAditya Choudhary
This CL is created as a best effort to migrate test targets to the new android ownership model. If you find incorrect or unnecessary attribution in this CL, please create a separate CL to fix that. For more details please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: Ide378ee123f87e5ca97b65be50c825e1b974cece
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: 3b57fe91b8 -s ours am: 17b51f931e -s ours am: 9262144d9d -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: I697361c02ecd3260b3ef4232fbb7d6dfb80a6eac 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: df15f8b17d -s ours am: 127e71b2ee -s ours am: eb56ba9043 -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: Ie3fdd8ab9d262813035383bcc4e1d01919582be8 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: c81fc006b2 -s ours am: 3b57fe91b8 -s ours am: 17b51f931e -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: I648f7fe5321def9eb26edabaa297b17e7653a675 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: df15f8b17d -s ours am: 127e71b2ee -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: I71f64f041e807262ac990b0faa9b79a6f48a705a 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: c81fc006b2 -s ours am: 25066bc7fd -s ours am: dbd7c7096e -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: Ibb9dbfb77bbee184def0bccbe7a131afd2d772ea 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: 9eaa09c348 -s ours am: c5a60a488c -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: I3405f9df9ce2cbd883975fcbe47cfaa6374db980 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: c81fc006b2 -s ours am: 25066bc7fd -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: If283b86c7885aad051dcb9821889928eed5f4fde 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: 9eaa09c348 -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: I7e8b887f748daf1b8eb856af22b7241137fbb88f 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: c81fc006b2 -s ours am: 3b57fe91b8 -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: I1667eb8f90e56389e05f96d7c6d1a1f8883bd69b 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: df15f8b17d -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: I68cc1b1535dd7cadd51d6d8fba5b9f16090b4b66 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: c81fc006b2 -s ours am: a42d72d7be -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: I7e9d681a961c043770a39c625775cc1b550f9d3e 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: 572cabd5e0 -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: Ia4dfd3522d4bfc3f9f75b82e948d4f172c018515 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: c63157e5f5 -s ours am: 940e34292f -s ours am: 022ce04497 -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: I0effd4ea06e410cd72b7c1d50a044de08db2ec47 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: ade6cc1a62 -s ours am: 2d92d642db -s ours am: 90a8fd0bdb -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: If2ac5f451790b5a8dd1061b72c2c43bbc35d3aee 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: f81dcdd38f -s ours am: b4cde53aa0 -s ours am: f6013c48c0 -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: I6cab744922ea6cf84ed036a0820f1cf661f73b03 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: 5582b40df0 -s ours am: b38088b56c -s ours am: ea665b596d -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: Ib1aef5e3e5cc564023b1130489755cf5056808aa 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: c63157e5f5 -s ours am: 940e34292f -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: Ibc2c9ea23d72474ba3b4f045bf96cc9163233990 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: 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: fa1f666683 -s ours am: aff2e3885b -s ours am: ade6cc1a62 -s ours am: 2d92d642db -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: Ia490f975e95c4094812eaed2c18eac72ac2558ed 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-901da30cdf7b4b9f971df8132dfa25d2" into android14-tests-dev am: 464a845d6b -s ours am: a8b7cedd0b -s ours am: f81dcdd38f -s ours am: b4cde53aa0 -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: I8f28b6502a74016066c3bb14ff07c58d2a7b4b1b 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: 5582b40df0 -s ours am: b38088b56c -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: I46cec5e6dcb47464333d17c2e303fec974cf092a 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: 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: I5c1926ad8b47ad04a0833a23fc67770f468f15a8 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: I997fbc8ec14cb3c94e38b85772cd97435ce3eec2 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: b9ef85ce64 -s ours am: 0129350dce -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: I07c74a2f1372ce48e13d7b7394cadcf2423e0193 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: 773d94a19a -s ours am: 9f09f5bfe5 -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: I293e81b98a9659e149d34f1d9598c13df441fbc3 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-38a3a0266153492e85477b9c8bf2459b" into main am: b6137f9685 -s ours am: 04aaa802b3 -s ours am: 0004cf2bd1 -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 b05d9c427b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790 Change-Id: Iaa68fa5467ab50d8a411be1155922d24ad2170a6 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: cc67c881d8 -s ours am: ccbb4de2c8 -s ours am: 40546b3fcd -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 b05d9c427b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790 Change-Id: I25482ebe9326104b88cc94ebb74713b13fd4a0db 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: 88904db4aa -s ours am: 59ab49fae9 -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: Ibb538dc7aef29a90036a76336fc7e7f35c8b51a0 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: 5b8aa1c642 -s ours am: 0dd43676f6 -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: I55d0cd860be37a3c846780eb06bd4df65ee545a8 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: 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: Id5fcb2414efdd2fa8743488cc16f4e5448cebcb0 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: Ia3660dd495d31b95c2dc4d5e5cea657ab15b087f 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-38a3a0266153492e85477b9c8bf2459b" into main am: b6137f9685 -s ours am: ac3896b54f -s ours am: 0ac1e01ae1 -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: I48b9b9d21deb24d60e2caac98412e5bff132dd44 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: cc67c881d8 -s ours am: 8d711e9669 -s ours am: 3cbf1fcb2b -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: Ia1bc11252e84b30a7d0ecee2fd7270a38b31c032 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: b9ef85ce64 -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: I7711b33fa9fa165eb2aaed98ab802273dc075b51 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: 773d94a19a -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: I62dedfa7ec6433c4994611be755450d65d1fca9a 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-38a3a0266153492e85477b9c8bf2459b" into main am: b6137f9685 -s ours am: 04aaa802b3 -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 b05d9c427b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790 Change-Id: I95908087d222642cdfd0a839a0d2a00da2fd4bd0 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: cc67c881d8 -s ours am: ccbb4de2c8 -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 b05d9c427b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790 Change-Id: I3aef0bfb4b8b3b6cc18b2651495cd3bc12b9168b 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: c63157e5f5 -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: I8c91b5fc19cba821d43eec642c7a588fc071bebe 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: ade6cc1a62 -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: I833d12fa455e8e289d082bf22009ce050cda65e7 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: f81dcdd38f -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: I614d4a7c147e27c62db61f5b116f5e9ac8ae779d 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: 88904db4aa -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: Ib022da8e4cfa7ec7643b66c0b26cb98e975c724a 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: 5b8aa1c642 -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: I0d68773856ea0eb15d13fa2482226cd810e87b94 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: 5582b40df0 -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: Ia56e34490d214da7bbdd249252d7cfb376248c4d 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>