Android N Preview 2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlcQZoIACgkQ6K0/gZqxDniPaQCfdjVI2e5QGPwSDmNa0xfwb69I
eTgAn1sLNHpHMcelbvs9To67D8koloQ9
=uPX1
-----END PGP SIGNATURE-----
resolved conflicts for merge of 4563938e to mnc-dr-dev-plus-aosp

Change-Id: I4f001f697a3fe312a535ce8f3b78d32881327314