refs/heads/android11-mainline-extservices-release - kernel/tests

commit: d1e21f5609c2430dc330b3e4747ed740fea629f0
[log]
author: Treehugger Robot <treehugger-gerrit@google.com>
Wed Sep 23 23:30:31 2020 +0000
committer: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Wed Sep 23 23:30:31 2020 +0000
tree: 4e89fe4575db7e202bccb2e259e84d4df9520638
parent: 5f9ed8f98e1e6c5dca15e42b423164ed0683f307 [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: I1bcf714236fd5f44f946a4bf0b4602f2acb310f3

tree: 4e89fe4575db7e202bccb2e259e84d4df9520638

devicetree/
net/
Android.bp
METADATA