Android 6.0.1 Release 51 (MOB30Q)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAld9l8AACgkQ6K0/gZqxDnhI7wCdH11lc453BBbJK4PVwsSovkkD
uUEAn0vMUpDrgxXC+yVP/GR/F3RiBCwO
=N1PB
-----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