diff options
author | Xin Li <delphij@google.com> | 2023-10-06 09:57:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-06 09:57:08 +0000 |
commit | 74e831404e2df400a9b9015ea9d7af1c6c8821df (patch) | |
tree | 005363446825ed5e14daa9f5792c4fb3b52aad61 | |
parent | ab1e02316d948033ee7a6f7915e7ff7249fa2563 (diff) | |
parent | 6bf0462773db938aca5bd4fab2cfea249b3a406a (diff) | |
download | okhttp-74e831404e2df400a9b9015ea9d7af1c6c8821df.tar.gz |
[automerger skipped] Merge "Merge Android 14" into main am: 3c174b1b70 -s ours am: c7f8ec264c -s ours am: 6bf0462773 -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/+/2775004
Change-Id: I441caa50df83f53794cc20bf59001765995a9a0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions