tree 97683a30fb986135d2c186baac816e5abff2a98b
parent 6a761d62e559e9c865111e1bc3a756c9bfe78f30
parent 6fd2027e2c13b1cc6210aa388de6f2dda404c4f9
author Karsten Tausche <karsten@fairphone.com> 1688730547 +0200
committer Karsten Tausche <karsten@fairphone.com> 1688730547 +0200
mergetag object 6fd2027e2c13b1cc6210aa388de6f2dda404c4f9
 type commit
 tag android-13.0.0_r52
 tagger The Android Open Source Project <initial-contribution@android.com> 1686681577 -0700
 
 Android 13.0.0 Release 52 (TQ3A.230605.012)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZIi36QAKCRDorT+BmrEO
 eG1lAJ9lPTXMRllpUs9hoiGk1djDL/h60wCfWs1VNmABKayhO61PO3stt11gg/I=
 =CWht
 -----END PGP SIGNATURE-----

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

Android 13.0.0 Release 52 (TQ3A.230605.012)

* tag 'android-13.0.0_r52':
  [DO NOT MERGE] Ignore MetricsTest on CTS 12.
  [DO NOT MERGE] Ignore MetricsTest on CTS 13.
  [DO NOT MERGE] Ignore MetricsTest on CTS 12.
  Make SSLSocketTest agnostic about whether TLSv1 is supported.
  [DO NOT MERGE] CTS 10: Work around blocklist class name change.
  [DO NOT MERGE] CTS 10: Work around ConscryptHostnameVerifier changes.
  [DO NOT MERGE] CTS 10: Add key size for XDH.
  [DO NOT MERGE] CTS 10: Remove invalid count check of unwrap calls.
  [DO NOT MERGE] CTS 11: Work around blocklist class name change.
  [DO NOT MERGE] CTS 11: Work around ConscryptHostnameVerifier changed.
  [DO NOT MERGE] CTS 11: Add key size for XDH.
  [DO NOT MERGE] CTS 11: Remove invalid count check of unwrap calls.
  Make testing of handshake session cipher suite consistent.
  CipherTest should skip unknown algorithms
  Clean up EXPECTED_BLOCK_SIZE
  Cherry-pick test changes to android10-tests-dev

Change-Id: Iebe5b3456cef29fa7354d992cc68ecc1dec01e35