tree cc8da1736e0f51c69723f93366c54fda43ffef61
parent e732b22a44ce9ee3745b368471b7a41399735c27
parent 4c0ff912fef4aeaa9dc660f88a49f3144b3fc79e
author Lorenzo Colitti <lorenzo@google.com> 1452067014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1452067014 +0000

Merge changes I10fbb3bc,Iba2afc09

* changes:
  Make GetSockDiag really return an InetDiagMsg, not a tuple.
  Don't fail if getting SO_BINDTODEVICE is not yet supported.