Android 6.0.1 Release 61 (MOB30Z)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlefxCcACgkQ6K0/gZqxDnh4lACeKnKwjqh1P388+Nhs/OQc9V8h
ZN4Aniih9CyNFRDKiKEyNxOuB9PUS0bW
=YzIE
-----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/