Android N Preview 5 (NPD90G)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlegzCgACgkQ6K0/gZqxDnipjACcDkrL/39iQqqbWZCNvEqDsvNI
reEAnRwWjrltg3QxnHMhNC90AuxCZj0I
=4ZBR
-----END PGP SIGNATURE-----
resolved conflicts for merge of 4563938e to mnc-dr-dev-plus-aosp

Change-Id: I4f001f697a3fe312a535ce8f3b78d32881327314