Merge "Increasing the size of the drag icon when a shortcut is dragged" into ub-launc...

author Sunny Goyal <sunnygoyal@google.com>

Fri, 22 Jul 2016 17:47:50 +0000 (17:47 +0000)

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

Fri, 22 Jul 2016 17:47:50 +0000 (17:47 +0000)
author Sunny Goyal <sunnygoyal@google.com>
Fri, 22 Jul 2016 17:47:50 +0000 (17:47 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 22 Jul 2016 17:47:50 +0000 (17:47 +0000)
diff --cc src/com/android/launcher3/Launcher.java
Simple merge
diff --cc src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
Simple merge
author	Sunny Goyal <sunnygoyal@google.com>
	Fri, 22 Jul 2016 17:47:50 +0000 (17:47 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 22 Jul 2016 17:47:50 +0000 (17:47 +0000)
		1	2
src/com/android/launcher3/Launcher.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java	patch \|	diff1 \|	diff2 \|	blob \| history