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

iEYEABECAAYFAleQBiEACgkQ6K0/gZqxDngZlgCePrA29vlmTyjXHqh3vgh24v/u
2M0An39hLBP7+HcfghfjSmlaXAF7B7JI
=mVnF
-----END PGP SIGNATURE-----
resolved conflicts for merge of 602eaa3d to master

Change-Id: I034975354c25efd940af7a459d90962bb81e031e
tree: fef6bdd9ca2927cb9681d8210e106e259f811913
  1. AndroidProducts.mk
  2. BoardConfig.mk
  3. mini_mips.mk
  4. overlay/