diff options
author | Xin Li <delphij@google.com> | 2021-08-15 04:36:54 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-15 04:36:54 +0000 |
commit | 693efe4ec96e5b8ac023cb0d028b75f843f39896 (patch) | |
tree | 8cb1a8aeff182a8df0c4135b5d27ee4990882ed6 | |
parent | fe71be750e6cfb9fbe39b677030794be1d13831d (diff) | |
parent | b8cc1a745dc05222b1b2b9275c730b7102df7370 (diff) | |
download | okhttp-693efe4ec96e5b8ac023cb0d028b75f843f39896.tar.gz |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 377a3f555c -s ours am: 924897d2a8 -s ours am: f262467826 -s ours am: b8cc1a745d -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: I1a555e56a8726f36b948c85b223e18a9d718d4bc
0 files changed, 0 insertions, 0 deletions