Glen Kuhne 91aeed6f55 Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev ...

am: 85f59ff42d

Change-Id: I0812fdee8ad859cb7efb56f980de4ca00ce3f5a5

2017-10-12 19:02:55 +00:00

..

assets

Merge "Index the System status page" into oc-mr1-dev

2017-09-13 00:06:27 +00:00

res

Use preference theme from SettingsLib

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

src

Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev

2017-10-12 19:02:55 +00:00

Android.mk

Migrate settings robolectric tests to mockito 2

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