Android 7.1.1 Release 38 (N6F26Y)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlji6o8ACgkQ6K0/gZqxDnhtUgCfTf3V2amR3VNAlZX9mRLMnv/M
xj4An25e37paDVKsvV/xitFZIKGHb38B
=LxYi
-----END PGP SIGNATURE-----
resolve merge conflicts of 79cf158c51 to mnc-dev

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