Android 6.0.1 release 25 (MTC19T)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlco4GEACgkQ6K0/gZqxDnj3xQCeN2GiT8yQaQSXOmx6u0UjiacC
oAEAn1iq8iyRTlAb5StkJW2JI9oX2bx9
=5eNj
-----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/