Android 6.0.1 Release 78 (MOB31S)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAliGif8ACgkQ6K0/gZqxDnj2vQCfZ8j7a1AfH6FZDki0yUYwbHeD
+3sAni5aSKDOvgnOpySsZti0hsnCSh9T
=x/L0
-----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/