Merge "Update Search UX for OC" into oc-dev am: 0cdade8a78

author Matthew Fritze <mfritze@google.com>

Tue, 25 Apr 2017 01:02:03 +0000 (01:02 +0000)

committer android-build-merger <android-build-merger@google.com>

Tue, 25 Apr 2017 01:02:03 +0000 (01:02 +0000)
author Matthew Fritze <mfritze@google.com>
Tue, 25 Apr 2017 01:02:03 +0000 (01:02 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 25 Apr 2017 01:02:03 +0000 (01:02 +0000)
diff --cc src/com/android/settings/search2/DatabaseIndexingManager.java
Simple merge
diff --cc src/com/android/settings/search2/SearchViewHolder.java
Simple merge
diff --cc tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
Simple merge
author	Matthew Fritze <mfritze@google.com>
	Tue, 25 Apr 2017 01:02:03 +0000 (01:02 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 25 Apr 2017 01:02:03 +0000 (01:02 +0000)
		1	2
src/com/android/settings/search2/DatabaseIndexingManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/search2/SearchViewHolder.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java	patch \|	diff1 \|	diff2 \|	blob \| history