| commit | a455bf01b90f654bee3a6970ad06eb241ecf709c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 21:20:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 21:20:27 2021 +0000 |
| tree | 639b7105d88707c56681b42e879c6ba129998b11 | |
| parent | dcb4c165c0f1197816414e8a611d3ba4e4182621 [diff] | |
| parent | 924897d2a8021725b4f757a3d6db3d3f31132ef2 [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 377a3f555c -s ours am: 924897d2a8 -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: Ie673edf348722de577fd491efb27973d38456997