Android 6.0.1 Release 77 (M4B30Z)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlhIdrQACgkQ6K0/gZqxDnjL5QCfTkPYjQRjULEdIIj49JMu7Z7z
Z5gAn1CpBdYvgXqleEWBybTJmnifN+nJ
=wglc
-----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/