Matthew Fritze 7448204f36 Merge "Index the System status page" into oc-mr1-dev am: 6203bde8d3 ...

am: 8896df965b

Change-Id: I70141cb7f89794f734a33b2f90e470e1554c3320

2017-09-13 09:47:02 +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 "Index the System status page" into oc-mr1-dev am: 6203bde8d3

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

Android.mk

Migrate settings robolectric tests to mockito 2

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