tree 6272acb63f1da162c93d954b55fb452880a4f566
parent baf5e5cbde03b31c7b4e65db457b6caa6cd65b1e
parent 5b01086c7a3d3c387eb0388c01b2fc525dc34223
author Karsten Tausche <karsten@fairphone.com> 1678914951 +0100
committer Karsten Tausche <karsten@fairphone.com> 1678914951 +0100
mergetag object 5b01086c7a3d3c387eb0388c01b2fc525dc34223
 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
 eJPRAKCJWWplLzJDwjiWNCpFFufZlXuPOwCcCU2QMA/AwoKX4dJv0YG9Pxw/06c=
 =9Cda
 -----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-core 4.6.1 for Robolectric prebuilt"
  Use mockito-core 4.6.1 for Robolectric prebuilt
  Update google-java-format-diff.py to v1.15.0
  Move Python script from distutils to shutil
  Update google-java-format to v1.15.0
  Add power category and data source to trace_config_detailed
  Enable new_robolectric
  Adds prebuilts for t based robolectric
  Revert "Adds prebuilts for t based robolectric"
  Adds prebuilts for t based robolectric
  Enable new_robolectric

Change-Id: I0d45ade9fb056b6388225658b491823add96e446