Android CTS 6.0 Release 18 (3942491)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlkJEi0ACgkQ6K0/gZqxDngTTwCfZhj/E6zd/3S/T9yYwPkEr8L8
4iAAoIwjP5I/1G/GvpOSh1RlJV7Bz/EX
=0qGk
-----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/