Android CTS 6.0 Release 16 (3736419)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAli4shMACgkQ6K0/gZqxDni5IgCfcK5LM5oNQ/mYT0xG9znsvW6h
H20An1jR5UYRR1HtildSCU8F3PhVh/v/
=KuUm
-----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/