Android CTS 6.0 Release 4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlbV4ecACgkQ6K0/gZqxDnjchQCgi7mfoAsw7Kwe0/neG7MRJE9Q
TnEAn33f6DrWDhDwaClf/1oKD/ecF80F
=pT3C
-----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/