tree 2a8c41898184453c0a9b9a6673be347a21b93f1a
parent 8085ed76b318889555229bd417a15102e1c7880c
parent 000a9cac14c7a85af4fb5bf49962e785dc736cb7
author Treehugger Robot <treehugger-gerrit@google.com> 1519713792 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1519713792 +0000

Merge changes I82fd7793,Id3cca05d

* changes:
  Make sock_diag_test.py pass on 4.9 devices that don't have SCTP.
  Make BPF tests pass on device.