Android Wear N Preview 1 (NVD36H)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAleQBiEACgkQ6K0/gZqxDnh4TQCfeyqUOSzuHJazGpXgwGVviHZq
5boAoIHeJjAALkVlJKyCL/iUI/n0uFh9
=BgLV
-----END PGP SIGNATURE-----
resolved conflicts for merge of 4563938e to mnc-dr-dev-plus-aosp

Change-Id: I4f001f697a3fe312a535ce8f3b78d32881327314