Android n mr1 preview 2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlhGDtAACgkQ6K0/gZqxDnjdlwCfYqKA/I5xgQ7nNDcvetA2cfCa
re0AnRwOxPxDJdBLJvMbynOr4PQrrqQ/
=CGTd
-----END PGP SIGNATURE-----
resolve merge conflicts of 1cff673 to nyc-dev-plus-aosp

Change-Id: I38e31b1e1eee0a456ebd602029198bb7907e1239