tree b1b1c69be40fa7566fac8a3ce9afc9f96a13e64f
parent bc5c92f21005c2078870b8534e151caf51d6e177
parent 80342e2f06af3d7b24e5dae5058ebc673406d146
author Karsten Tausche <karsten@fairphone.com> 1678893427 +0100
committer Karsten Tausche <karsten@fairphone.com> 1678893427 +0100
mergetag object 80342e2f06af3d7b24e5dae5058ebc673406d146
 type commit
 tag android-13.0.0_r32
 tagger The Android Open Source Project <initial-contribution@android.com> 1678730034 -0700
 
 Android 13.0.0 release 32
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZA9jMgAKCRDorT+BmrEO
 ePuTAKCL4X/gjTFTuQzxEL6FpBMDaFKVWQCdHH72Ne9I+L3KuZE2K0mkuhXLWk0=
 =evyw
 -----END PGP SIGNATURE-----

Merge tag 'android-13.0.0_r32' into int/13/fp3

Android 13.0.0 release 32

* tag 'android-13.0.0_r32':
  Revert "Use Mockito 4.6.1 API"
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Use Mockito 4.6.1 API
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE

Change-Id: I04f9adfb7ac518556abeb5f69763d9495d6bdbbf