Merge "Using the default search widget in Launcher3" into ub-now-queens

author Sunny Goyal <sunnygoyal@google.com>

Wed, 12 Nov 2014 18:00:23 +0000 (18:00 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 12 Nov 2014 18:00:23 +0000 (18:00 +0000)
author Sunny Goyal <sunnygoyal@google.com>
Wed, 12 Nov 2014 18:00:23 +0000 (18:00 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 12 Nov 2014 18:00:23 +0000 (18:00 +0000)
diff --cc src/com/android/launcher3/Launcher.java
Simple merge
diff --cc src/com/android/launcher3/Utilities.java
Simple merge
author	Sunny Goyal <sunnygoyal@google.com>
	Wed, 12 Nov 2014 18:00:23 +0000 (18:00 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 12 Nov 2014 18:00:23 +0000 (18:00 +0000)
		1	2
src/com/android/launcher3/Launcher.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/Utilities.java	patch \|	diff1 \|	diff2 \|	blob \| history