Android 6.0.0 release 25
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlYxAeIACgkQ6K0/gZqxDnji2QCcDSq6L/gxTiNAKwUsi5xdMN2j
uzsAn2YnOcLiVHIMeDva3/aIzOvr7GDm
=f8Ve
-----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/