tree 2377c537550a7a7c490d7adb887c79d87d2feb87
parent 925d461dab2366512c9cbdef80cff0eaa6796438
parent be168f35b9a7937797249b7499a2ce6e95324de2
author Karsten Tausche <karsten@fairphone.com> 1629994751 +0200
committer Karsten Tausche <karsten@fairphone.com> 1629994751 +0200
mergetag object be168f35b9a7937797249b7499a2ce6e95324de2
 type commit
 tag android-security-10.0.0_r53
 tagger The Android Open Source Project <initial-contribution@android.com> 1617678804 -0700
 
 Android security 10.0.0 release 53
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYGvR1AAKCRDorT+BmrEO
 eJpHAJ9DwRIjRrziE7Q6PImuWwaSBMj3wwCgiUFzTbvRCm0mzWFAB3e6s8EyuMM=
 =tFks
 -----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':
  Cherry-pick "Refactor Regexp.prototype"
  Fix use-after-free in proxy resolver

Change-Id: I4c402fb4584dae6e67b99ac8f36526fb1577bf0c