Fan Zhang 2f84a358d9 Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev ...

am: 6ef56e43ee

Change-Id: I162d479851065017806cb82a16eb8fba7ad5aca7

2017-07-25 21:30:57 +00:00

..

assets

Improve search indexing time.

2017-07-18 14:53:49 -07:00

res

Use preference theme from SettingsLib

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

src

Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev

2017-07-25 21:30:57 +00:00

Android.mk

Migrate settings robolectric tests to mockito 2

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