Android CTS 6.0 Release 8 (3046108)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAleFZ30ACgkQ6K0/gZqxDnjX8ACfYseXaqQHfuX87T+nywt8nHs+
xaIAn2FmZuu5AUIn/RuPRJ+anJNFX8J5
=9ie4
-----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/