OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
151cc31
6ef56e4
)
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
author
Fan Zhang
<zhfan@google.com>
Tue, 25 Jul 2017 21:30:57 +0000
(21:30 +0000)
committer
android-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
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/search/SearchIndexableResources.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/search/BaseSearchIndexProvider.java
Simple merge
diff --cc
src/com/android/settings/search/SearchIndexableResources.java
Simple merge