diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-16 05:31:39 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-16 05:31:39 +0000 |
commit | 94345ce18c92ab4a4db07a34701f72f6217b1c20 (patch) | |
tree | 005363446825ed5e14daa9f5792c4fb3b52aad61 | |
parent | 9be475ad971077c7309c44672c2887a9f75b8bcc (diff) | |
parent | 0004cf2bd131cf2b5abfaee8cb78d74d0b6f962c (diff) | |
download | okhttp-94345ce18c92ab4a4db07a34701f72f6217b1c20.tar.gz |
[automerger skipped] Merge changes from topic "am-38a3a0266153492e85477b9c8bf2459b" into main am: b6137f9685 -s ours am: 04aaa802b3 -s ours am: 0004cf2bd1 -s ours
am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 b05d9c427b is already in history
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790
Change-Id: Iaa68fa5467ab50d8a411be1155922d24ad2170a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions