Android 6.0.1 release 40 (MOB30G)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlcn+t4ACgkQ6K0/gZqxDnivagCfXMxD4sJ3JoiM3Syqc+7WQXpH
EaIAnR/2xgiRy0/PXj1uMI6EMcPU7nHp
=tsjG
-----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/