tree 4e89fe4575db7e202bccb2e259e84d4df9520638
parent 4e7622d838882e935f1c8763cac40d1a5e6a8ef9
parent c69e8a5eb61c73ae16d2cc98ae16597e12c3b176
author Karsten Tausche <karsten@fairphone.com> 1638958028 +0100
committer Karsten Tausche <karsten@fairphone.com> 1638958028 +0100
mergetag object c69e8a5eb61c73ae16d2cc98ae16597e12c3b176
 type commit
 tag android-11.0.0_r48
 tagger The Android Open Source Project <initial-contribution@android.com> 1633400144 -0700
 
 Android 11.0.0 Release 48 (RD2A.211001.002)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYVu1UAAKCRDorT+BmrEO
 eEkDAJ0fzQVB3IWV4IPy78jHMcT7Z2hT6QCfVfo9PTHCymTXe6mhUkfVV9ZuJfE=
 =6Jle
 -----END PGP SIGNATURE-----

Merge tag 'android-11.0.0_r48' into int/11/fp3

Android 11.0.0 Release 48 (RD2A.211001.002)

* tag 'android-11.0.0_r48':
  Use blocking sockets with timeout for xfrm_tunnel_test
  Fix VtsKernelNetTest#VtsKernelNetTest#testKernelNetworking

Change-Id: I34b791d517cb0296b1a4f04bb9da453db7a8f3c3