Android Wear N Preview 2 (NVD83H)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlePzroACgkQ6K0/gZqxDniRegCfRJBcf6CM2qpgmM5jIoaA6cUw
O4oAniVdx1kH8nKPvmTIdfWfHotydxQp
=+y21
-----END PGP SIGNATURE-----
resolved conflicts for merge of 4563938e to mnc-dr-dev-plus-aosp

Change-Id: I4f001f697a3fe312a535ce8f3b78d32881327314