diff options
| author | Xin Li <delphij@google.com> | 2021-08-13 21:20:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 21:20:27 +0000 |
| commit | a455bf01b90f654bee3a6970ad06eb241ecf709c (patch) | |
| tree | 639b7105d88707c56681b42e879c6ba129998b11 | |
| parent | dcb4c165c0f1197816414e8a611d3ba4e4182621 (diff) | |
| parent | 924897d2a8021725b4f757a3d6db3d3f31132ef2 (diff) | |
| download | okhttp-android12-qpr3-s7-release.tar.gz | |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 377a3f555c -s ours am: 924897d2a8 -s oursandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-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: Ie673edf348722de577fd491efb27973d38456997
0 files changed, 0 insertions, 0 deletions