Android CTS 6.0 Release 9 (3102289)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlex+dIACgkQ6K0/gZqxDnjRsQCgi8lkSO9UF/BAP7cltNH4g/0T
w7wAn2PvasDRqQjOMiTITvxE53okrRyv
=L73L
-----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/