Android 7.0.0 Release 29 (NBD91Z)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAliTmKEACgkQ6K0/gZqxDnjyHgCfUinS184Cwe5VTp+ZhQEv3+hL
r/EAn2eChkqVzMucA5VE2QUbco84x0ZM
=J0th
-----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/