OSDN Git Service

Merge changes I10fbb3bc,Iba2afc09
authorLorenzo Colitti <lorenzo@google.com>
Wed, 6 Jan 2016 07:56:54 +0000 (07:56 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 6 Jan 2016 07:56:54 +0000 (07:56 +0000)
commit09f36abb939ebad430a8b95beda70577c8fc1fa2
treecc8da1736e0f51c69723f93366c54fda43ffef61
parente732b22a44ce9ee3745b368471b7a41399735c27
parent4c0ff912fef4aeaa9dc660f88a49f3144b3fc79e
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.