aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 06:39:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 06:39:31 +0000
commit695ab87f56ee7a7a5a2f964064abe7b1714cb189 (patch)
tree005363446825ed5e14daa9f5792c4fb3b52aad61
parentfba6cc075034f7d9477b3a2234ed92566ac312ae (diff)
parentc5a60a488cb5608c7bdb72575c9528bf1dc9c81f (diff)
downloadokhttp-695ab87f56ee7a7a5a2f964064abe7b1714cb189.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: 9eaa09c348 -s ours am: c5a60a488c -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: I3405f9df9ce2cbd883975fcbe47cfaa6374db980 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions