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

iEYEABECAAYFAlgcywQACgkQ6K0/gZqxDngWkwCfTFi0xyRDEPmjOMgeEm4ikeT6
FykAnR/y1ab0wel7pInIY5Elcss7rILG
=hAXK
-----END PGP SIGNATURE-----
resolve merge conflicts of 1cff673 to nyc-dev-plus-aosp

Change-Id: I38e31b1e1eee0a456ebd602029198bb7907e1239