Android CTS 7.0 Release 14 (4372023)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWd0u3QAKCRDorT+BmrEO
eJ6xAJ9o4zi1ZScw8BYkmDgzi3vW7L0TCQCfVDmZjL1qelbH76W8jlG2yw1o42w=
=ihlQ
-----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/