tree 119a4dbabca8a1176008a5fbcdb3d5e8e4336872
parent 64ee868ff3454342f97cc703048b0014a2dfc109
parent 44cacaa8f10ddbe62e96bc5fcc77427ca10ad1c2
author Dmitry Shmidt <dimitrysh@google.com> 1517444370 +0000
committer android-build-merger <android-build-merger@google.com> 1517444370 +0000

Merge "Fix dev settings crash when no OEM unlock service"
am: 44cacaa8f1

Change-Id: Ica60f5411908a8edb34b9263ee8d6d6b4617587b