Android CTS 7.0 Release 2 (3340807)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlgROi4ACgkQ6K0/gZqxDniFUwCeKl4HawVikgb854h6qxvwsKfM
JxAAn3KwSIzDzeW5FFhZvJMCsdz3HqAb
=06cj
-----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/