tree ffb122974b94d98f1ac691558e2f07fe266005a1
parent 14a12cbb4287f27cd342ed14d57f9ca29da97f76
parent 7a9f1b489884975ccb704b3e2dcd08882ccc0179
author Treehugger Robot <treehugger-gerrit@google.com> 1610578876 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610578876 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Track behavior change in default HostnameVerifier." into oreo-mr1-cts-dev am: e79d676601 -s ours am: aabe25da47 -s ours am: e6554d1859 -s ours am: 2ee26d8d6c am: 70cd8e994a -s ours am: 7a9f1b4898

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1547918

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib83ae5622c83f3b597745c59097775d373fe7248