tree d9c50e59d49dd13f3696acfe509ce5b5c9a66c19
parent 890cefe88c27d2f20741fba327303efa92b13f1a
parent 6fcdb944a9e22e97ebb2323071fcb4a7220e7869
author Karsten Tausche <karsten@fairphone.com> 1638958968 +0100
committer Karsten Tausche <karsten@fairphone.com> 1638958968 +0100
mergetag object 6fcdb944a9e22e97ebb2323071fcb4a7220e7869
 type commit
 tag android-11.0.0_r48
 tagger The Android Open Source Project <initial-contribution@android.com> 1633400126 -0700
 
 Android 11.0.0 Release 48 (RD2A.211001.002)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYVu1PgAKCRDorT+BmrEO
 eAxjAJ9MjREkYLouy5p872/RjglcvlRR4QCeM0gWqK5pLMECDbHH0oAP+sy8+xY=
 =MJU7
 -----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':
  DO NOT MERGE Fix CVE-2020-15358 and CVE-2020-13871
  DO NOT MERGE Fix floating point to text conversion overflow
  Update fix for issue 147928666.

Change-Id: I0a2c0053eabe90ae2c32f261482dcb881e70efe5