aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2021-08-13 23:27:07 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-13 23:27:07 +0000
commit135a95d35c24d44c3e5dd29bfb27720f12c89198 (patch)
tree8cb1a8aeff182a8df0c4135b5d27ee4990882ed6
parent54e60f4e6b630e1b28ed47d04a2375309b482d75 (diff)
parentdcb4c165c0f1197816414e8a611d3ba4e4182621 (diff)
downloadokhttp-135a95d35c24d44c3e5dd29bfb27720f12c89198.tar.gz
[automerger skipped] Merge ab/7633965 am: f656bd9b3c -s ours am: dcb4c165c0 -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/+/15547192 Change-Id: I2c12964d8788821de264ce7811f70472e28f5ee3
0 files changed, 0 insertions, 0 deletions