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

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

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

Change-Id: Ibcc09804d01f0105a14ad07615e39d8007b5d5cf