aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 06:06:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 06:06:30 +0000
commit127e71b2ee22edc2fa015f11458e3867a8dcbe2c (patch)
tree1cab24f5c6213e40794b612fa7017cf8ea745fb6
parent940e34292fa06feae0fa6650badaab3e32368cd5 (diff)
parentdf15f8b17d1e069a7a499d67f6c4bbb08c794f5e (diff)
downloadokhttp-127e71b2ee22edc2fa015f11458e3867a8dcbe2c.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 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>
0 files changed, 0 insertions, 0 deletions