OSDN Git Service

Merge "Block inline-results from Settings search" into oc-dr1-dev am: bea9a5d739
authorMatthew Fritze <mfritze@google.com>
Wed, 21 Jun 2017 18:03:00 +0000 (18:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Jun 2017 18:03:00 +0000 (18:03 +0000)
commitd56bf722f634d079637ddf6d577cf6f3157de386
treedfc4819caa2cb7dfb9559f0455f5bd0e898f26c5
parent759fab17a419d1740618bcc5ef58bb3881584599
parenteeec8eecc0e97865355ecadd0940d55e34d96a2f
Merge "Block inline-results from Settings search" into oc-dr1-dev am: bea9a5d739
am: eeec8eecc0

Change-Id: I8094a44c26f0c9d457c1df7d67b6ee0e0fa672ab
src/com/android/settings/search/SearchResultsAdapter.java