Android 7.1.1 Release 31 (N4F26U)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAljidoAACgkQ6K0/gZqxDni//ACeLWHS7ksL8cU8ID04pTGKnjcs
y4wAoIcTYgk7MPsMvLgVhjU5c9U2R8Ly
=3kWJ
-----END PGP SIGNATURE-----
resolve merge conflicts of 79cf158c51 to mnc-dev

Change-Id: Ied32e83215e386c801c02991a0b2fa4baa25b643
(cherry picked from commit 50358a80b1724f6cf1bcdf003e1abf9cc141b122)
1 file changed