Daniel Nishi 9ef9bfb6e9 Merge "Don't show warning dialog on opening ASM settings." into oc-dev am: 81f98a8fd5 ...

am: c7734f589e

Change-Id: Idc4760b31fa82f2e5387225f3da7c621a8decf4c

2017-04-20 18:53:59 +00:00

..

android

Use the new OemLockService to get OEM lock state.

2017-04-19 21:33:37 +01:00

com/android

Merge "Don't show warning dialog on opening ASM settings." into oc-dev am: 81f98a8fd5

2017-04-20 18:53:59 +00:00