diff options
author | Xin Li <delphij@google.com> | 2021-08-13 21:03:07 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 21:03:07 +0000 |
commit | 0447f60a5216634377ccb32abef4475edabdee7d (patch) | |
tree | 639b7105d88707c56681b42e879c6ba129998b11 | |
parent | de3d45d459afc583073a22f3bd9528b1e17bf928 (diff) | |
parent | 377a3f555cbadb65c1ce42791daee95223efd4bf (diff) | |
download | okhttp-0447f60a5216634377ccb32abef4475edabdee7d.tar.gz |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 377a3f555c -s oursandroid-mainline-12.0.0_r99android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r49android-mainline-12.0.0_r122android-mainline-12.0.0_r100android12-mainline-networkstack-release
am skip reason: Merged-In Ic9a8a0ef59723baa08b44ad9db0dc5c695ba9578 with SHA-1 35aef1ba39 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/15546966
Change-Id: I1b176707928e4a8c35287b7e1e535c4af3915229
0 files changed, 0 insertions, 0 deletions