Android CTS 7.0 Release 21 (4723847)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWvnQVwAKCRDorT+BmrEO
eJ+OAJsHI9uYoynErwIrmkzYN923TNsEQQCghc+9mY/Qo3KX1pdrUkPgg9UgwH8=
=pmDz
-----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/