Android N Preview 4 (NPD56N)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAldxZDgACgkQ6K0/gZqxDnhLTgCeJnDCgchi8cFSUFKw89EAjwKC
GAAAnR0Q2WUI1oE4y4q5v1lyoc0qA5In
=PYHF
-----END PGP SIGNATURE-----
resolved conflicts for merge of 4563938e to mnc-dr-dev-plus-aosp

Change-Id: I4f001f697a3fe312a535ce8f3b78d32881327314