tree 08b21f535c3ab0791a9d6468af56866bebfaef40
parent 06c6585077b70bfea8781b770a88398c185ef2d2
parent 2e7ec470f7dedd79bbdff73ecbdbc455bd48add5
author Karsten Tausche <karsten@fairphone.com> 1629994751 +0200
committer Karsten Tausche <karsten@fairphone.com> 1629994751 +0200
mergetag object 2e7ec470f7dedd79bbdff73ecbdbc455bd48add5
 type commit
 tag android-security-10.0.0_r53
 tagger The Android Open Source Project <initial-contribution@android.com> 1617678825 -0700
 
 Android security 10.0.0 release 53
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYGvR6QAKCRDorT+BmrEO
 eJ+8AJ0SBcrgoQDpeHtTEG6eJQ42rXXtUwCgiU0PL0YJZTfHnCy7PTovoZcXQhI=
 =0XkF
 -----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':
  Set default polling mask and p2p listen mask

Change-Id: I1343ac628d33f631e4b4100e74e78c2521734244