Android Wear 7.1.1 Release 1 (NXG12F)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAli0zC8ACgkQ6K0/gZqxDngdvwCcDB4tmBzpNs2j/UrYfuYXVwuG
Ly0AnR2/vFHiQFSn4MDhH7Odip1vLe+/
=CupP
-----END PGP SIGNATURE-----
resolved conflicts for merge of 4563938e to mnc-dr-dev-plus-aosp

Change-Id: I4f001f697a3fe312a535ce8f3b78d32881327314