Android CTS 7.0 Release 12 (4215243)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlmEr4UACgkQ6K0/gZqxDniY7QCfdel4+8TMcac7aasxzYjppkF9
TYAAn2kkwIOTPFoFqCWET4Q98+5oQosL
=zvmO
-----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/