tree bc095ec391923d386c848563dc970ed637e2af81
parent e322ac040f9538dc8df61be5ed90c51bbe0e20e0
parent 41a7c3f648ab38b8792a827f0c83eea920c272c3
author Karsten Tausche <karsten@fairphone.com> 1629997850 +0200
committer Karsten Tausche <karsten@fairphone.com> 1629997850 +0200
mergetag object 41a7c3f648ab38b8792a827f0c83eea920c272c3
 type commit
 tag android-security-10.0.0_r55
 tagger The Android Open Source Project <initial-contribution@android.com> 1623119497 -0700
 
 Android Security 10.0.0 Release 55 (7269719)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYL7WiQAKCRDorT+BmrEO
 ePXXAJ9IFINtqKQDyiEp33+cWpqYDY/P6QCggeVQgP8AlyQK00Ge3hrilZoHpMY=
 =C7iw
 -----END PGP SIGNATURE-----

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

Android Security 10.0.0 Release 55 (7269719)

* tag 'android-security-10.0.0_r55':
  P2P: Fix a corner case in peer addition based on PD Request

Change-Id: Ia1d2651b77b13f3f99287189df87c419908b035c