diff options
author | Xin Li <delphij@google.com> | 2021-08-13 23:37:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 23:37:01 +0000 |
commit | 81fa30343ff1a1908bed3ca6a5711009d20016b4 (patch) | |
tree | 8cb1a8aeff182a8df0c4135b5d27ee4990882ed6 | |
parent | 135a95d35c24d44c3e5dd29bfb27720f12c89198 (diff) | |
parent | a455bf01b90f654bee3a6970ad06eb241ecf709c (diff) | |
download | okhttp-81fa30343ff1a1908bed3ca6a5711009d20016b4.tar.gz |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 377a3f555c -s ours am: 924897d2a8 -s ours am: a455bf01b9 -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: Iba01cf1534112eb17f01432ae32cdc902e56d329
0 files changed, 0 insertions, 0 deletions