commit | 4ffa864ffd88f27c9cf246682b0450211d133b5a | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Sep 23 23:29:32 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 23 23:29:32 2020 +0000 |
tree | 4e89fe4575db7e202bccb2e259e84d4df9520638 | |
parent | 086360c01423572c4916962e226d1d027e8d7705 [diff] | |
parent | 2bfdc7d34f9f31a713301e66a6e0c200da0034a5 [diff] |
[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: b742e21dc4 -s ours am: 2bfdc7d34f -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: I9fd67ff0272b078e2ab56468c850298c85386f40