tree a3443c7a641ccb61dd44bf2cab54dd7421b2cc6b
parent 833c0eca0f41b077af45805f39875e3ba14118ff
parent 3f6b2f38446be379e2027c11c9148ea2aa354a27
author Karsten Tausche <karsten@fairphone.com> 1658234547 +0200
committer Luca Weiss <luca.weiss@fairphone.com> 1658327313 +0200
mergetag object 3f6b2f38446be379e2027c11c9148ea2aa354a27
 type commit
 tag android-security-11.0.0_r57
 tagger The Android Open Source Project <initial-contribution@android.com> 1657145150 -0700
 
 Android security 11.0.0 release 57
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYsYHPwAKCRDorT+BmrEO
 eGGEAKCFslamvFXDZiA7rtF6aonPTVzHoQCfWqNqIo152pgTX7/ndque0ZzpLiY=
 =iRji
 -----END PGP SIGNATURE-----

Merge tag 'android-security-11.0.0_r57' into int/11/fp3

Android security 11.0.0 release 57

* tag 'android-security-11.0.0_r57':
  Only treat PNG_COLOR_TYPE_RGB as 565

Change-Id: I655ea2ee7aa739e46f49d3f9e612da0978185eb9