tree 80eb29d4c10140e6cba36931489f8f2ca8f0345e
parent c8fb2af3b9737c196717a16951664ac56223554f
parent ca6a41740899b13592f7407bc04bd0b6376a5bb8
author Bharath <bharath@fairphone.com> 1652285093 +0530
committer Bharath <bharath@fairphone.com> 1652287188 +0530
mergetag object ca6a41740899b13592f7407bc04bd0b6376a5bb8
 type commit
 tag android-security-11.0.0_r54
 tagger The Android Open Source Project <initial-contribution@android.com> 1649115416 -0700
 
 Android security 11.0.0 release 54
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYkuBGAAKCRDorT+BmrEO
 eCpgAJ95CjHqOwuYuKgOlLvSgkEkQ6PGcACeKE8HvDBcM+NENilP0aZuprLceEM=
 =vfku
 -----END PGP SIGNATURE-----

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

Android security 11.0.0 release 54

* tag 'android-security-11.0.0_r54':
  Add caller check to com.android.credentials.RESET

Change-Id: Idcdc33aec8a6ba070a1c431d06e6b2d67cc35bf1