Jeffrey Huang ff3971038e Merge changes from topic "OemUnlockPreference" ...

* changes:
  Add comments to avoid merge conflicts
  Introduce OemUnlockPreferenceController

2017-09-20 20:26:57 +00:00

..

assets

Merge "Index the System status page" into oc-mr1-dev am: 6203bde8d3

2017-09-13 09:47:02 +00:00

res

Use preference theme from SettingsLib

2017-07-10 14:56:49 -07:00

src

Merge changes from topic "OemUnlockPreference"

2017-09-20 20:26:57 +00:00

Android.mk

Migrate settings robolectric tests to mockito 2

2017-05-24 15:14:31 -07:00