Merge "Allowing the first screen to expand to the screen edge" into ub-launcher3...

author Sunny Goyal <sunnygoyal@google.com>

Tue, 7 Jun 2016 17:10:33 +0000 (17:10 +0000)

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

Tue, 7 Jun 2016 17:10:33 +0000 (17:10 +0000)
author Sunny Goyal <sunnygoyal@google.com>
Tue, 7 Jun 2016 17:10:33 +0000 (17:10 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 7 Jun 2016 17:10:33 +0000 (17:10 +0000)
diff --cc src/com/android/launcher3/Workspace.java
Simple merge
diff --cc src/com/android/launcher3/dragndrop/DragLayer.java
Simple merge
author	Sunny Goyal <sunnygoyal@google.com>
	Tue, 7 Jun 2016 17:10:33 +0000 (17:10 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 7 Jun 2016 17:10:33 +0000 (17:10 +0000)
		1	2
src/com/android/launcher3/Workspace.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/dragndrop/DragLayer.java	patch \|	diff1 \|	diff2 \|	blob \| history