diff options
author | Xin Li <delphij@google.com> | 2021-08-16 15:13:54 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-16 15:13:54 +0000 |
commit | e9ca4ce0b24a8a255c78f779d1d856f9f245adc6 (patch) | |
tree | 8cb1a8aeff182a8df0c4135b5d27ee4990882ed6 | |
parent | c44f327b237f9ee727c0743c7a5de11ae7b37364 (diff) | |
parent | 0447f60a5216634377ccb32abef4475edabdee7d (diff) | |
download | okhttp-e9ca4ce0b24a8a255c78f779d1d856f9f245adc6.tar.gz |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 377a3f555c -s ours am: 0447f60a52 -s ours
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: I873930317f6651de527f4ed4a14c52f174d2f81d
0 files changed, 0 insertions, 0 deletions