Android 6.0.1 release 7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlaEVv8ACgkQ6K0/gZqxDnh+xQCfRd5B6Hi0PSkepZ9rGh/pg0WV
0QQAnRKahwLEmNayzYW1g+C5CjtDCB79
=A7iC
-----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/