Android CTS 7.0 Release 8 (3863512)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAljdpV8ACgkQ6K0/gZqxDnhfZwCeLU82Bq67+3Yko3qbSRONxOVx
kB4AnjgMpTNa7MOeNoUZ47G//cXv8+5+
=Q9vH
-----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/