Android Wear O Preview 3 (Android O Beta 2)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAllMTXsACgkQ6K0/gZqxDnjzNwCcDWBswYQ0oLA/scViYQleJ69Q
bpEAnR8BgqN6GLs6zrYPznu3r2A3KsFk
=8YtE
-----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