tree dbcf04e91e57d337ae8f8824cda415d79dbe1615
parent 3e73648fbde57119c7a707e5344cf8f2d55b4dfb
parent 71e612e72a1f11cda6656195045cfc37612ad217
author Karsten Tausche <karsten@fairphone.com> 1629994765 +0200
committer Karsten Tausche <karsten@fairphone.com> 1629994765 +0200
mergetag object 71e612e72a1f11cda6656195045cfc37612ad217
 type commit
 tag android-security-10.0.0_r53
 tagger The Android Open Source Project <initial-contribution@android.com> 1617678859 -0700
 
 Android security 10.0.0 release 53
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYGvSCwAKCRDorT+BmrEO
 eOcdAJ9uUqaxHvHACH/zOnEBqB9lO+nl9wCePvrBDI1jk+bEDkcfIJJ5Z5NvqCQ=
 =v6nS
 -----END PGP SIGNATURE-----

Merge tag 'android-security-10.0.0_r53' into int/10/fp2

Android security 10.0.0 release 53

* tag 'android-security-10.0.0_r53':
  Revert "Keep a light version of the SBN around"
  Put notification demotion behind flag

Change-Id: I2272f89db80f663d788071f7e3b1b84a55136729