diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-13 22:08:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-13 22:08:45 +0000 |
| commit | bf413adf11131feb8b4bc728f123af3e51c6eb6c (patch) | |
| tree | 49e4df40dae9a4dc7f4e5827a1e120740fa7b685 /ojluni/annotations/hiddenapi/java/net/ServerSocket.java | |
| parent | 86cbf4462c69478534c870d555f5ea91f9ca633b (diff) | |
| parent | 9cc0d834405c169016015dcc9b6336b5dd4d7eba (diff) | |
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
Original change: https://android-review.googlesource.com/c/platform/libcore/+/1547918
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I06fc3a956860a8160dded74009906964009d9dfd
Diffstat (limited to 'ojluni/annotations/hiddenapi/java/net/ServerSocket.java')
0 files changed, 0 insertions, 0 deletions