tree 0fc3bb26c06727a209226c3513666b211148d442
parent f65da0c9e6c37c8837e9e39695ccc0de1ea18256
parent 88197184a5d9ffd9556d355e81ae8584ba7f546f
author Karsten Tausche <karsten@fairphone.com> 1638958032 +0100
committer Karsten Tausche <karsten@fairphone.com> 1638958032 +0100
mergetag object 88197184a5d9ffd9556d355e81ae8584ba7f546f
 type commit
 tag android-11.0.0_r48
 tagger The Android Open Source Project <initial-contribution@android.com> 1633400144 -0700
 
 Android 11.0.0 Release 48 (RD2A.211001.002)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYVu1UAAKCRDorT+BmrEO
 eLysAKCDGyeZGTtjjIfbS9g59fWBuILElACeIsP+4oLxcVT9ChYLLqqvU76HOnw=
 =q/52
 -----END PGP SIGNATURE-----

Merge tag 'android-11.0.0_r48' into int/11/fp3

Android 11.0.0 Release 48 (RD2A.211001.002)

* tag 'android-11.0.0_r48':
  [RESTRICT AUTOMERGE] Modify FileTest#test_createNewFile to match the behavior change on kernel version 5.7+
  [RESTRICT AUTOMERGE] Track behavior change in default HostnameVerifier.
  [RESTRICT AUTOMERGE] Remove unnecessary test.
  [RESTRICT AUTOMERGE] Remove unnecessary test.
  [DO NOT MERGE] Reject non-ASCII hostnames and SANs.
  [DO NOT MERGE] Reject non-ASCII hostnames and SANs.
  Reject non-ASCII hostnames and SANs.
  [DO NOT MERGE] Track behavior change in default HostnameVerifier.

Change-Id: I24e800f0a78c13c74293e1525ee2a9149a6270b2