tree 1b5c2a34ae1cc7f430d252ebe80e136f6bb0584b
parent d090f2e43189448676d88c0a64b14b563c75d4b9
parent 57b7bf079203311c0d56af87369d70d2beb039b3
author Karsten Tausche <karsten@fairphone.com> 1587723973 +0200
committer Karsten Tausche <karsten@fairphone.com> 1587723974 +0200
mergetag object 57b7bf079203311c0d56af87369d70d2beb039b3
 type commit
 tag android-9.0.0_r55
 tagger The Android Open Source Project <initial-contribution@android.com> 1586215091 -0700
 
 Android 9.0.0 Release 55 (6197209)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXou4swAKCRDorT+BmrEO
 eOt1AJ9o6hvXJqd5SzA1ImYYYNaW2880BACfZdlJXViDg47TbcLQJvQV1BG5lsY=
 =0k+2
 -----END PGP SIGNATURE-----

Merge the android-9.0.0_r55 release tag
Android 9.0.0 Release 55 (6197209)

* tag 'android-9.0.0_r55':
  Add SQL tokenizer and disallow subqueries in selection
  Add SafetyNet logging to Tvprovider
  Handle unrecognized columns and avoid SQL injection

Change-Id: Ie7afe7ad2b8c68c4329cd1e61d06c22721fbbb0c