Doris Ling 36c1934162 Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev am: a7f5953a02 ...

am: be7044845d

Change-Id: I64412b26bacf567973989fbeaa2cfe2ca42e87b4

2017-07-13 21:28:54 +00:00

..

assets

Use SettingsLib's versions of Custom* classes.

2017-06-21 14:47:37 -07:00

res

Use preference theme from SettingsLib

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

src

Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev am: a7f5953a02

2017-07-13 21:28:54 +00:00

Android.mk

Migrate settings robolectric tests to mockito 2

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