tree 7a742a8d896866f19d64c24ba87b5e7ff7f40725
parent d65764d69feaad271aadf30918137c4224aa6385
parent 5130ba38a11ad570582feb1ecde8f6450f8a3601
author Karsten Tausche <karsten@fairphone.com> 1638960064 +0100
committer Karsten Tausche <karsten@fairphone.com> 1638960064 +0100
mergetag object 5130ba38a11ad570582feb1ecde8f6450f8a3601
 type commit
 tag android-11.0.0_r48
 tagger The Android Open Source Project <initial-contribution@android.com> 1633400092 -0700
 
 Android 11.0.0 Release 48 (RD2A.211001.002)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYVu1HAAKCRDorT+BmrEO
 eA75AJ99+JLYr7KzBAE3BUC0kyJu5b6iOwCfVCiYvpRtM8EUO43DDXiMWtjyp34=
 =taSz
 -----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':
  Add Unsupported App Usage annotations to ConscryptEngineSocket.
  Add Unsupported App Usage annotations to ConscryptEngineSocket.

Change-Id: I15c20b4f55c44976383c927115cf1ef323f15b14