Daniel Nishi 56e04db460 Merge "Re-add the block of text explaining the feature." into oc-mr1-dev am: 3315f38c3f ...

am: df0e716b43

Change-Id: Ibe767b5bd21ed75ea188a1a6561aa974edd2b449

2017-09-08 22:22:32 +00:00

..

assets

Merge "Re-add the block of text explaining the feature." into oc-mr1-dev am: 3315f38c3f

2017-09-08 22:22:32 +00:00

res

Use preference theme from SettingsLib

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

src

Merge "Re-add the block of text explaining the feature." into oc-mr1-dev am: 3315f38c3f

2017-09-08 22:22:32 +00:00

Android.mk

Migrate settings robolectric tests to mockito 2

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