Android CTS 7.0 Release 4 (3542264)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlhITG0ACgkQ6K0/gZqxDngA+wCff+RMaIbMbzzgRgSp5c5E7OPj
jcoAnRGsfJGrjak93xbF2xCLBjFK9qCm
=EorS
-----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/