aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 06:40:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 06:40:52 +0000
commitc7e445cb22c5df95441fd3a020d838511be924e4 (patch)
tree005363446825ed5e14daa9f5792c4fb3b52aad61
parent71809e871321a2ff0060980ca30122d8c9a89fc4 (diff)
parenteb56ba9043fd94d1814774e98a6b38cd6049e81c (diff)
downloadokhttp-c7e445cb22c5df95441fd3a020d838511be924e4.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: eb56ba9043 -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: Ie3fdd8ab9d262813035383bcc4e1d01919582be8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions