tree 8274228d6bc2dd68afbe3e366fd27a6efb3a8313
parent 1d443c6a0b8b6f7501e88e1b97a795d690b9e1b3
parent a1e00f6835eed0682400db48b42fc65a8caca83a
author Karsten Tausche <karsten@fairphone.com> 1639047293 +0100
committer Karsten Tausche <karsten@fairphone.com> 1639047293 +0100
mergetag object a1e00f6835eed0682400db48b42fc65a8caca83a
 type commit
 tag android-security-11.0.0_r49
 tagger The Android Open Source Project <initial-contribution@android.com> 1635873552 -0700
 
 Android security 11.0.0 release 49
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYYFzEAAKCRDorT+BmrEO
 eMwjAJ9IZAxBjS8qdMFrZp0KE2BFBxC7gACffC2vdubUavFOzCOHVG1h/YDWygw=
 =01JX
 -----END PGP SIGNATURE-----

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

Android security 11.0.0 release 49

* tag 'android-security-11.0.0_r49':
  Cherry-pick one upstream patch

Change-Id: Icc46b573a637c8518dc1fa788512d21772cf0dcb