Android CTS 6.0 Release 21 (4214424)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlmErpgACgkQ6K0/gZqxDngoqgCaAuFrBqTVI73H3FkuiecBhS0Q
uNgAn0g45Y+EI02a3tsoax8yi2D/J6Ie
=FGjl
-----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/