aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 05:31:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 05:31:00 +0000
commitc1d982ca683fd30cb9aa984c02b3a9c1d61667c0 (patch)
tree005363446825ed5e14daa9f5792c4fb3b52aad61
parentf80648606ff5978b85088b33d4888b057743ca3d (diff)
parent3cbf1fcb2b0f34e9df2595ddb16f4ae6c7f18892 (diff)
downloadokhttp-c1d982ca683fd30cb9aa984c02b3a9c1d61667c0.tar.gz
[automerger skipped] Merge changes from topic "am-901da30cdf7b4b9f971df8132dfa25d2" into android14-tests-dev am: 464a845d6b -s ours am: cc67c881d8 -s ours am: 8d711e9669 -s ours am: 3cbf1fcb2b -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: Ia1bc11252e84b30a7d0ecee2fd7270a38b31c032 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions