Android N Preview 5 (NPD90G)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlegzCgACgkQ6K0/gZqxDnjloQCeN7kz3+8/RKOzOwXu+QUP9n06
wpMAni8YSwjcNkSVOXCQDNfCFObd8/E2
=AqZD
-----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/