summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-09-23 23:30:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-23 23:30:31 +0000
commitd1e21f5609c2430dc330b3e4747ed740fea629f0 (patch)
tree4e89fe4575db7e202bccb2e259e84d4df9520638
parent5f9ed8f98e1e6c5dca15e42b423164ed0683f307 (diff)
parent2bfdc7d34f9f31a713301e66a6e0c200da0034a5 (diff)
downloadtests-android11-mainline-os-statsd-release.tar.gz
[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 oursandroid-mainline-11.0.0_r44android-mainline-11.0.0_r23android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-release
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
0 files changed, 0 insertions, 0 deletions