Android 7.1.1 Release 32 (N4F26W)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAljidwIACgkQ6K0/gZqxDnh1DACff3fsyX9AY6+tJLNFXQ8so8qg
vGAAn3wY/PWrnLVuj73QMgQZJg8oW1bA
=U4oo
-----END PGP SIGNATURE-----
resolve merge conflicts of 79cf158c51 to mnc-dev

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