tree ffb122974b94d98f1ac691558e2f07fe266005a1
parent 2d26534092b34006a66f9b507bd3ee4dedbd07a2
parent 9074a894d050713e029e56f3bd273be964304f26
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610578868 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610578868 +0000

Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Track behavior change in default HostnameVerifier." into oreo-mr1-cts-dev am: e79d676601 -s ours" into pie-cts-dev am: f79b99d030 -s ours am: 012ae97680 -s ours am: 9cc0d83440 am: bf413adf11 -s ours am: 9074a894d0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ba9f282dfd1428a6e59dde02c5e48eb2f7139a5