Android N IOT Preview 2 (NIG40)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAli134wACgkQ6K0/gZqxDngszgCggzg+P31aED+FzNqa4iJfAymn
2wwAn1uccimv0hvFWvkl4Je9AE298EDb
=wSnc
-----END PGP SIGNATURE-----
resolved conflicts for merge of 4563938e to mnc-dr-dev-plus-aosp

Change-Id: I4f001f697a3fe312a535ce8f3b78d32881327314