Merge "Fix widget reorder animations in multi-window mode." into ub-launcher3-master

author Jonathan Miranda <jonmiranda@google.com>

Fri, 30 Dec 2016 00:42:11 +0000 (00:42 +0000)

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

Fri, 30 Dec 2016 00:42:11 +0000 (00:42 +0000)
author Jonathan Miranda <jonmiranda@google.com>
Fri, 30 Dec 2016 00:42:11 +0000 (00:42 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 30 Dec 2016 00:42:11 +0000 (00:42 +0000)
diff --cc src/com/android/launcher3/CellLayout.java
Simple merge
diff --cc src/com/android/launcher3/graphics/DragPreviewProvider.java
Simple merge
author	Jonathan Miranda <jonmiranda@google.com>
	Fri, 30 Dec 2016 00:42:11 +0000 (00:42 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 30 Dec 2016 00:42:11 +0000 (00:42 +0000)
		1	2
src/com/android/launcher3/CellLayout.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/graphics/DragPreviewProvider.java	patch \|	diff1 \|	diff2 \|	blob \| history