Android 6.0.1 release 42 (MOB30I)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlcn+5oACgkQ6K0/gZqxDnjRyACffT6j5B+kMmuBANBiIBQu5tUm
LqMAn1wbDL58YjIiUNm94GLe/3ifPj9s
=dqMZ
-----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/