OSDN Git Service

Merge changes I3b881be8,I80d97bd5,Id115e8b2 am: b764f45fd9
authorLorenzo Colitti <lorenzo@google.com>
Wed, 27 Jan 2016 05:59:32 +0000 (05:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jan 2016 05:59:32 +0000 (05:59 +0000)
commitae7648fda62735a3efd2d7a879944a6ce6d8ba75
treed966acc8de22fe887e5e8b485b76d94093af5161
parent6097a0d8a2dbfdf2b61eb33fab2ac88c08d49196
parent91dcd99d9ebee7c0a41416fc7ea3fe74aa4a7f34
Merge changes I3b881be8,I80d97bd5,Id115e8b2 am: b764f45fd9
am: 91dcd99d9e

* commit '91dcd99d9ebee7c0a41416fc7ea3fe74aa4a7f34':
  Fix lint warnings.
  Note a 3.18 commit in neighbour_test.py.
  SOCK_DESTROY is no longer optional.