From: Lorenzo Colitti <lorenzo@google.com>
Date: Wed, 27 Jan 2016 05:59:32 +0000 (+0000)
Subject: Merge changes I3b881be8,I80d97bd5,Id115e8b2 am: b764f45fd9
X-Git-Tag: android-x86-7.1-r1~99
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ae7648fda62735a3efd2d7a879944a6ce6d8ba75;p=android-x86%2Fsystem-extras.git

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.
---

ae7648fda62735a3efd2d7a879944a6ce6d8ba75