tree e711c00c3a75051e92f05b9bd73330a03752a45a
parent 54da35a63c203cacb0f0cfbe941d6fb5e9e3608a
parent 9334bb1f2edfa8a42bec1a55771a1ca7fbdfb698
author Treehugger Robot <treehugger-gerrit@google.com> 1600899763 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600899763 +0000

[automerger skipped] Merge "Use blocking sockets with timeout for xfrm_tunnel_test" into pie-vts-dev am: 092e8067d4 am: 05ad5dcbce -s ours am: 9334bb1f2e -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: I05bfa0ff95d1c8c8ce7814cdef2745d2997fded6