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

iEYEABECAAYFAlbgwbgACgkQ6K0/gZqxDnhhzgCeKUepkeWop248gOruBYQrq0WV
X74An35DgqBjMW7TL4xM0tRubccb8Ns/
=tjBS
-----END PGP SIGNATURE-----
resolved conflicts for merge of 4563938e to mnc-dr-dev-plus-aosp

Change-Id: I4f001f697a3fe312a535ce8f3b78d32881327314