[automerger skipped] Merge "Use blocking sockets with timeout for xfrm_tunnel_test" into pie-vts-dev am: 092e8067d4 -s ours am: 80ad26abd0 -s ours am: 8a44a1cf09 -s ours am: 0f7c1603eb -s ours

am skip reason: Change-Id I92a39f8890244ebe918f48bcf0971e85795b2a1e with SHA-1 a563236b85 is in history

Original change: https://android-review.googlesource.com/c/kernel/tests/+/1258077

Change-Id: If6b9a4e2e335a02159de26c116b38cb0c25441f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: aab8551ed6cf00ab715b49f4c5eff93f423cf5dd
  1. devicetree/
  2. net/
  3. Android.bp
  4. METADATA