aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 04:45:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 04:45:04 +0000
commitf15ada33945307294cfbf222d459f2e4cc873fd6 (patch)
tree1cab24f5c6213e40794b612fa7017cf8ea745fb6
parent9983c854ab719293664c432c3667ce84200cb887 (diff)
parentaff2e3885b797e9040d77cd5c80a52a0aef67653 (diff)
downloadokhttp-f15ada33945307294cfbf222d459f2e4cc873fd6.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: fa1f666683 -s ours am: aff2e3885b -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: Ic984c5a29ff31b188f353273e4c500e29b740d54 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions