tree 8cb1a8aeff182a8df0c4135b5d27ee4990882ed6
parent 7a338678a401135f9e54939eb327ec43f1aa6270
parent 377a3f555cbadb65c1ce42791daee95223efd4bf
author Xin Li <delphij@google.com> 1628887903 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628887903 +0000

[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 377a3f555c -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: I941a64182bd1cdd1cfd585cb94ffaceaef1342d5