Merge changes I33da0d7f,I36c31609 into ub-launcher3-calgary

author Winson Chung <winsonc@google.com>

Fri, 29 Jul 2016 05:49:20 +0000 (05:49 +0000)

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

Fri, 29 Jul 2016 05:49:20 +0000 (05:49 +0000)
author Winson Chung <winsonc@google.com>
Fri, 29 Jul 2016 05:49:20 +0000 (05:49 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 29 Jul 2016 05:49:20 +0000 (05:49 +0000)
diff --cc src/com/android/launcher3/Launcher.java
Simple merge
diff --cc src/com/android/launcher3/Workspace.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Fri, 29 Jul 2016 05:49:20 +0000 (05:49 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 29 Jul 2016 05:49:20 +0000 (05:49 +0000)
		1	2
src/com/android/launcher3/Launcher.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/Workspace.java	patch \|	diff1 \|	diff2 \|	blob \| history