Android N Preview 4 (NPD56N)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAldxZDgACgkQ6K0/gZqxDngLggCfVy7I6s11kaq59KlTN68JiCzI
RaIAn0vky0u32tHJSDfZPkP/BCj4H/Fo
=e3N9
-----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/