Android 6.0.1 Release 54 (MTC19Z)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAld9m+oACgkQ6K0/gZqxDnidkACcDrwYNzDlMJKM9a8Cbu3kma3w
NU0An0COFYY5sfXouRDkCHbpz+QPycNy
=z3nO
-----END PGP SIGNATURE-----
Resolve a merge issue between lmp and lmp-mr1+

Change-Id: I336cb003fb7f50fd7d95c30ca47e45530a7ad503
(cherry picked from commit 33f6da1092834f1e4be199cfa3b6310d66b521c0)
(cherry picked from commit bb3a0338b58fafb01ac5b34efc450b80747e71e4)
1 file changed