Android 6.0.1 Release 49 (MOB30O)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAld9gecACgkQ6K0/gZqxDniZWQCggDtb44TverMQUmv0Wdy7ARVV
p7MAmwb+5Z6NoSt7EqknJrPTjsRwL8aC
=VtSu
-----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/