aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 05:48:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 05:48:11 +0000
commitbf6322072ffdb243a1a6bed16ee6f429b50399e1 (patch)
tree005363446825ed5e14daa9f5792c4fb3b52aad61
parent3eeebe8252a6ecde0f30945d68cf296afa21c773 (diff)
parent90a8fd0bdb58cff96760dcaa70418ad336fe5381 (diff)
downloadokhttp-bf6322072ffdb243a1a6bed16ee6f429b50399e1.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: ade6cc1a62 -s ours am: 2d92d642db -s ours am: 90a8fd0bdb -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: If2ac5f451790b5a8dd1061b72c2c43bbc35d3aee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions