Matthew Fritze 8cd0562bd6 Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev am: 4bd0f411ce ...

am: af054e63e0

Change-Id: I35667061a61fd66e8ab8acafccffb53f00f15149

2017-05-17 19:06:59 +00:00

..

android

Use the new OemLockService to get OEM lock state.

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

com/android

Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev am: 4bd0f411ce

2017-05-17 19:06:59 +00:00