commit | 9334bb1f2edfa8a42bec1a55771a1ca7fbdfb698 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Sep 23 22:07:05 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 23 22:07:05 2020 +0000 |
tree | e711c00c3a75051e92f05b9bd73330a03752a45a | |
parent | e00eb472ecb32bf02b10cb9dbe89a1f8a8fd3383 [diff] | |
parent | 05ad5dcbce1ac67803a4f38224914852903154a6 [diff] |
[automerger skipped] Merge "Use blocking sockets with timeout for xfrm_tunnel_test" into pie-vts-dev am: 092e8067d4 am: 05ad5dcbce -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: If14bb6877f66ab89b75ddfba123eeb929a89924c