aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-15 04:22:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-15 04:22:51 +0000
commit0e055559ec157283daac9bb0c0d26d157441fe72 (patch)
tree8cb1a8aeff182a8df0c4135b5d27ee4990882ed6
parentb8cc1a745dc05222b1b2b9275c730b7102df7370 (diff)
parentd729d9c08a34129702373b0125c3aa201dee6bbe (diff)
downloadokhttp-0e055559ec157283daac9bb0c0d26d157441fe72.tar.gz
Merge "[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 377a3f555c -s ours am: a4b53a5a62 -s ours" into sc-qpr1-dev-plus-aosp am: d729d9c08a -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: I1b20ae3948e5185bece671aaf613098da2cc603b
0 files changed, 0 insertions, 0 deletions