Android 7.0.0 Release 35 (NBD92Q)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWicOygAKCRDorT+BmrEO
eL7aAJ4ll8/WE4w6x/0ZZEN3c+7rRrN5kwCeJkJrWZjycVPTjP953towCrcIJoI=
=QFk8
-----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/