tree aab8551ed6cf00ab715b49f4c5eff93f423cf5dd
parent 6f2e352173a4a2f83e13e36a06332925a376bef2
parent 8a44a1cf09111cfa966ad1d9bee65950ef7a68c6
author Treehugger Robot <treehugger-gerrit@google.com> 1633781366 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633781366 +0000

[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 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: I9c6ab89194d353a0750f1435c83bd5140539fea8