aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 17:12:07 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-10-08 17:12:07 +0000
commit97604aa844f4e3f035ea9c164b1bc370902e116c (patch)
tree639b7105d88707c56681b42e879c6ba129998b11
parentf656bd9b3c6ff003a67625df161542bd07c41704 (diff)
parenteeb8cf7fab24eaf23c77ff0121286ad07935968a (diff)
downloadokhttp-97604aa844f4e3f035ea9c164b1bc370902e116c.tar.gz
Merge "Merge "Merge "[automerger skipped] Merge "[DO NOT MERGE] Update ConnectionSpecTest for cipher suite removal" into pie-cts-dev am: d99a2fdd77 -s ours" into android10-tests-dev am: e401e4be0e -s ours" into android11-tests-dev am: 9de132a5d5 -s ours" into android12-tests-dev
0 files changed, 0 insertions, 0 deletions