tree 0846f6982f360829a734ee02863cf78241f04483
parent 1b3a5a6fe59fde11097ef26983281004bc4e4daa
parent 2ad90182e2d9b2ac924c113d3c97e6f008a5e756
author Karsten Tausche <karsten@fairphone.com> 1688728615 +0200
committer Karsten Tausche <karsten@fairphone.com> 1688728615 +0200
mergetag object 2ad90182e2d9b2ac924c113d3c97e6f008a5e756
 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
 eBEiAJ0acCgrZPPmhshrMwUwnFnXCk4fwQCffmfcddFPLlY4aJcZQigWJ0yZhn4=
 =IZ5U
 -----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':
  net-test: not supported in netns before 4.15 if BH_TIMEOUT_SYSCTL does not exist.
  net-test: Reset blackhole before fastopen test
  fix: change next IP header option to "3b" (no next header)
  net-test: Reset blackhole before fastopen test
  net-test: set sufficient MEMLOCK rlimit for bpf test
  net-test: work around UML crashes during shutdown
  net-test: work around UML crashes during shutdown
  net-test: attempt to use namespaces on devices with ADB/TCP
  Fix VtsKernelNetTest#VtsKernelNetTest#testKernelNetworking
  Add the same mark with policy in SaInfo API

Change-Id: I6de04bbed24274e13941556cc9aa89081c79f1d9