Android N Preview 3 (NPD35K)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAldV3JkACgkQ6K0/gZqxDnjEswCeIl8oLQ/KV7ebSL/QhVC1BKEn
fEoAnRB910Z6OcDjs8Qb5afOhBPvvgsd
=Zec0
-----END PGP SIGNATURE-----
resolved conflicts for merge of 4563938e to mnc-dr-dev-plus-aosp

Change-Id: I4f001f697a3fe312a535ce8f3b78d32881327314