Android CTS 6.0 Release 24 (4400446)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWfkW2gAKCRDorT+BmrEO
eAFzAJ4i62MSeKRBA9L22QvRZ9Vn+SC8EQCdH7lT1pGDiGzA5+DTy9Cur2mCzMU=
=Vtxq
-----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/