Android Wear O Preview 4
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWdLTrAAKCRDorT+BmrEO
eJIOAJ49zNx451VXDK0Svj/zmAwDtrHEKgCeLKKxq9GRxZT+iGzJacaKxhWcntU=
=8dO+
-----END PGP SIGNATURE-----
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