aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-14Snap for 11219529 from 43969c8699bb8b0befc7fd27a45f201c71cbb6b7 to ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_332714010Android Build Coastguard Worker
mainline-tzdata4-release Change-Id: I3207525c8840009cba28f03a0cf3a24a9188d6e7
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-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-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 ↵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
2023-07-06Merge "Make okhttp tests ambivalent about TLS 1.x." into android12-tests-dev ↵Treehugger Robot
am: ffff5e64a6 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2646786 Change-Id: If950dfd6cf0d2dce75e6f04e181e7a78d36340b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06Merge "Make okhttp tests ambivalent about TLS 1.x." into android12-tests-devTreehugger Robot
2023-07-05Make 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)
2023-05-10Snap for 10102166 from 0e806edcba4a959e1098c5b478608e54ecd6dc5f to ↵aml_tz4_331910000android13-mainline-tzdata4-releaseAndroid Build Coastguard Worker
mainline-tzdata4-release Change-Id: I330b85350f52ed1a8a97da72bffd68eb984a734a
2023-04-03Add com.android.ondevicepersonalization to apex_available.Andrew Vuong
Bug: 276784992 Test: TH Change-Id: I9f0c851f57ff6f4ca51edd5eabdb691bff92ff03
2023-02-02(TM-MP) Rb back compat: Base changesNeha Pattan
Bug: 263816046 Test: manual Change-Id: Ibae437bf9b5ed51b80030a4f172301e0073c513b
2022-11-29Extend the visibility of okhttp to all of libcoreOrion Hodson
Required for some blueprint file re-structuring in libcore. Bug: 255273691 Bug: 255275437 Test: m Change-Id: I71040aeb29b4c985b9e84a123295791530206d45 Merged-In: I71040aeb29b4c985b9e84a123295791530206d45 (cherry picked from commit e86d5b03c5a6b1621800c1dfec86c372377dc7ea)
2022-11-17[PATCH] Enable new_robolectric am: 04d65d2ba6Rex Hoffman
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/20464386 Change-Id: I98ec18d0b6e221d620c710c456637f6618dac5f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-13[PATCH] Enable new_robolectricRex Hoffman
Test: mma in /external/robolectric Bug: 244627502 Change-Id: Iea16ea478624c054540ddaeb177adf12ccb0abc3 Merged-In: Iea16ea478624c054540ddaeb177adf12ccb0abc3
2022-10-10Snap for 9157479 from 5917095d4152bc8ab198f899cd3794c5427d36ab to ↵aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010Android Build Coastguard Worker
mainline-tzdata4-release Change-Id: I68aae33c9a5de0c1eff9344039c629dff11431c6
2022-09-14Merge "Set apex_available field in OkHttp library target for use in ↵Neil Vohra
AdServices module" into tm-mainline-prod
2022-09-13Set apex_available field in OkHttp library target for use in AdServices moduleNeil Vohra
Test: Presubmits Change-Id: Iccc42fd82b1b798550857c8fca0f2dae0f891569 Bug: b/237838314 Merged-In: I6e65e4f91c847fcbb39fe5e25a61b7d7e3a1296c
2022-09-13Include okhttp-norepackage in sdk snapshot for S+Paul Duffin
Previously, the sdk snapshot would include all modules listed as members for each build release even when the module specified that it was not suitable for that release, by virtue of having a min_sdk_version > target build release. A follow up change in build/soong will exclude any module whose min_sdk_version > target build release from the sdk snapshot for that build release. Unfortunately, not every sdk member has a min_sdk_version specified. In that case it defaults to use the sdk_version and if that is not specified then it defaults to the "current" API level. Modules that are also part of an updatable APEX are required to have a min_sdk_version but other modules are not which means that those modules will not appear in any snapshot other than the latest one. This change adds a min_sdk_version: "S" property to the okhttp-norepackage library to make sure that it will continue to be included in the sdk snapshot for S+ once the follow up change is applied. Bug: 240406019 Test: packages/modules/common/build/mainline_modules_sdks.sh # Ran the previous command with and without this change to make # sure that this change does not change the sdk snapshot # contents. Also ran the previous command with the follow up # change in build/soong to make sure that it does not change the # sdk snapshot either. Change-Id: I3fc3dfe867bd7687585cc16078c6b68b58190eb4 (cherry picked from commit 6ae7083ae1677a164b48d4b2713bf9a06a535b0e) Merged-In: I3fc3dfe867bd7687585cc16078c6b68b58190eb4
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: df7b69f0ca -s ours am: f7ed88329e -s ours am: e6f20599f9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: Id7af56bc0542022a8f3ed1d8dab78232066eba70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: 24a643da8e -s ours am: 76fc8f4998 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: Ifd93575e327fe31c6ec84c26667b1449ce43b3d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android13-frc-odp-releaseandroid13-devPete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: df7b69f0ca -s ours am: f7ed88329e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: Ia991f18204d446c63e50a71d53fedf4e66b983d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: df7b69f0ca -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: I07109f3176ff7db66caa6a696fa9568377b9ab70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am: 24a643da8e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: I437d923d66a06292de56234ec118824f504dd707 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: Iae9b11abd745889acef5a73eab7117c02b63904f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am: 3ba50826f4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: I504efbe6f64609596a3b1c4a13095c89e226c52a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am: daf7b23787 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: I6a510885194b350863e829b4e1a112311a934c12 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am: 459e6fd7d9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: I31f0fff137dd7aabe0efbb84450c37fc6de73b4e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[automerger skipped] [DO NOT MERGE] Update external/okhttp/repackaged to ↵Pete Bentley
match source. am: d101e9eff4 am: 35d92595a5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: I684a2d45fc381abe25131dc5f175abe788f57acd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[DO NOT MERGE] Update external/okhttp/repackaged to match source. am: d101e9eff4Pete Bentley
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/17823868 Change-Id: Ica0ed13be3743ca71c48f82792da59fd89e1b935 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22[DO NOT MERGE] Update external/okhttp/repackaged to match source.Pete Bentley
The fix for CVE-2021-0341 in qt-dev was cherry-picked from pi-dev. However while the repackaged okhttp files did not required merging for pi-dev, they *do* for qt-dev and beyond. This change merges them in qt-dev, and qt-qpr2-dev after automerging. Is set to do not merge as the fix was applied correctly to rvc-dev and all branches downstream of that. Bug: 171980069 Test: atest CtsLibcoreTestCases CtsLibcoreOkHttpTestCases Change-Id: Ic47bb42d68c768277be0a8677cd9830ee03ff293
2022-04-13Merge "Merge "Merge "Merge "UPSTREAM: Increase test timeout for slow ↵Automerger Merge Worker
devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472" am: 6549691b14 am: 102a74baba am: b6821f6df2 am: 8b36497875 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350 Change-Id: I736519c5348372bf2b31e6badd7da4466d4193e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Merge "Merge "Merge "UPSTREAM: Increase test timeout for slow ↵Automerger Merge Worker
devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472" am: 6549691b14 am: 102a74baba am: b6821f6df2 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350 Change-Id: I790f56c7590314d0f75c2abdd1240dcf81411d7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Merge "Merge "Merge "UPSTREAM: Increase test timeout for slow ↵Automerger Merge Worker
devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472" am: 6549691b14 am: 102a74baba Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350 Change-Id: Ie62ee893e877e37103ac9605758f3f3f66c4b15f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Merge "Merge "Merge "UPSTREAM: Increase test timeout for slow ↵Automerger Merge Worker
devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472" am: 6549691b14 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350 Change-Id: I44e05c4728f0c9b9fd50a7d401677a1a3df97ac8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 18:58:49 +0000