Merge "Show IME when search query != null after rotation" into ub-launcher3-calgary...

author Hyunyoung Song <hyunyoungs@google.com>

Fri, 9 Sep 2016 22:13:33 +0000 (22:13 +0000)

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

Fri, 9 Sep 2016 22:13:33 +0000 (22:13 +0000)
author Hyunyoung Song <hyunyoungs@google.com>
Fri, 9 Sep 2016 22:13:33 +0000 (22:13 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 9 Sep 2016 22:13:33 +0000 (22:13 +0000)
diff --cc src/com/android/launcher3/Launcher.java
Simple merge
diff --cc src/com/android/launcher3/allapps/AllAppsContainerView.java
Simple merge
author	Hyunyoung Song <hyunyoungs@google.com>
	Fri, 9 Sep 2016 22:13:33 +0000 (22:13 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 9 Sep 2016 22:13:33 +0000 (22:13 +0000)
		1	2
src/com/android/launcher3/Launcher.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/allapps/AllAppsContainerView.java	patch \|	diff1 \|	diff2 \|	blob \| history