Android 6.0.1 Release 47 (MMB30K)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAld9evUACgkQ6K0/gZqxDnhhdACfcdkXGIwmtslTU1jPcSpGcdu+
OC4AoIE7kH4Y/eWQHn5aZ/ndAVS8SCET
=sdD7
-----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/