diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-16 05:01:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-16 05:01:32 +0000 |
| commit | 0004cf2bd131cf2b5abfaee8cb78d74d0b6f962c (patch) | |
| tree | 005363446825ed5e14daa9f5792c4fb3b52aad61 | |
| parent | 40546b3fcd9598f3ffb7f88ae201882bc91849fa (diff) | |
| parent | 04aaa802b328a4790971b3e4f6200ed6963765ea (diff) | |
| download | okhttp-0004cf2bd131cf2b5abfaee8cb78d74d0b6f962c.tar.gz | |
[automerger skipped] Merge changes from topic "am-38a3a0266153492e85477b9c8bf2459b" into main am: b6137f9685 -s ours am: 04aaa802b3 -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: I95908087d222642cdfd0a839a0d2a00da2fd4bd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions