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:
759fab1
eeec8ee
)
Merge "Block inline-results from Settings search" into oc-dr1-dev am: bea9a5d739
author
Matthew Fritze
<mfritze@google.com>
Wed, 21 Jun 2017 18:03:00 +0000
(18:03 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 21 Jun 2017 18:03:00 +0000
(18:03 +0000)
am:
eeec8eecc0
Change-Id: I8094a44c26f0c9d457c1df7d67b6ee0e0fa672ab
1
2
src/com/android/settings/search/SearchResultsAdapter.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/search/SearchResultsAdapter.java
Simple merge