diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-16 04:29:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-16 04:29:37 +0000 |
commit | ac3896b54f04518f24cf2ddfbcfa6d7075318697 (patch) | |
tree | 005363446825ed5e14daa9f5792c4fb3b52aad61 | |
parent | 8d711e9669722bcb805d2602b8e492dc565b3d1d (diff) | |
parent | b6137f9685efcfbd637347f6a469f0384f9c8880 (diff) | |
download | okhttp-ac3896b54f04518f24cf2ddfbcfa6d7075318697.tar.gz |
Merge changes from topic "am-38a3a0266153492e85477b9c8bf2459b" into main am: b6137f9685 -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: I29796699b1136a4e7325c9423268f87efa759561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions