tree 0fa8d9e7874bedc3d5b0240c332afb1e34ec766f
parent ca69393b8f54e0cd38d876547a0d82e641951798
parent b74b4ad38fa162d3fe09e035fa570f419261c7dd
author Elliott Hughes <enh@google.com> 1463176643 +0000
committer android-build-merger <android-build-merger@google.com> 1463176643 +0000

resolve merge conflicts of 1cff673 to nyc-dev-plus-aosp
am: b74b4ad38f

* commit 'b74b4ad38fa162d3fe09e035fa570f419261c7dd':
  Make dhcpcd-6.8.2 admit that it uses BSD extensions.

Change-Id: Idc1accf23b67aadda5894f902f6c06d59ae2ed01