OSDN Git Service

Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
authorFan Zhang <zhfan@google.com>
Tue, 25 Jul 2017 21:30:57 +0000 (21:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Jul 2017 21:30:57 +0000 (21:30 +0000)
am: 6ef56e43ee

Change-Id: I162d479851065017806cb82a16eb8fba7ad5aca7

1  2 
src/com/android/settings/search/BaseSearchIndexProvider.java
src/com/android/settings/search/SearchIndexableResources.java