Merge "Fixes a bug where the user ends in freescroll state even for regular workspace...

author Mario Bertschler <bmario@google.com>

Thu, 29 Dec 2016 23:33:01 +0000 (23:33 +0000)

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

Thu, 29 Dec 2016 23:33:01 +0000 (23:33 +0000)
author Mario Bertschler <bmario@google.com>
Thu, 29 Dec 2016 23:33:01 +0000 (23:33 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 29 Dec 2016 23:33:01 +0000 (23:33 +0000)
diff --cc src/com/android/launcher3/PagedView.java
Simple merge
diff --cc src/com/android/launcher3/Workspace.java
Simple merge
author	Mario Bertschler <bmario@google.com>
	Thu, 29 Dec 2016 23:33:01 +0000 (23:33 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 29 Dec 2016 23:33:01 +0000 (23:33 +0000)
		1	2
src/com/android/launcher3/PagedView.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/Workspace.java	patch \|	diff1 \|	diff2 \|	blob \| history