aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-14 23:02:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-14 23:02:41 +0000
commit565b2c54d266ae85b8ac9126fa4fe2bc6640e42c (patch)
tree9de43c5748a79d4b173643fa4000151953d657b6
parent2f4acee7467f9f328838c6fb3469308ed3022281 (diff)
parent102a74baba97155fd77a3ccb0c51ae18dacd1eb7 (diff)
downloadokhttp-565b2c54d266ae85b8ac9126fa4fe2bc6640e42c.tar.gz
Merge "Merge "Merge "Merge "UPSTREAM: Increase test timeout for slow 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: I7b4cd19f0bd263fd30a101c66d55626660a16227 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions