aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 06:40:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 06:40:18 +0000
commiteb56ba9043fd94d1814774e98a6b38cd6049e81c (patch)
tree005363446825ed5e14daa9f5792c4fb3b52aad61
parentdbd7c7096e8991167428b817827ce997d0020e44 (diff)
parent127e71b2ee22edc2fa015f11458e3867a8dcbe2c (diff)
downloadokhttp-eb56ba9043fd94d1814774e98a6b38cd6049e81c.tar.gz
[automerger skipped] Merge changes from topic "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>
0 files changed, 0 insertions, 0 deletions