Android 6.0.1 release 9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlaEV3gACgkQ6K0/gZqxDngqkACfW5bd0X7df44k2YUQEbA8+PYv
7iYAn3M3M55Y3Pi3Mj6zS5sV9cSJ22ut
=TJ4f
-----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/