Merge "Ensuring that the widget drag outline is padded by the default widget padding...

author Winson Chung <winsonc@google.com>

Tue, 8 Oct 2013 22:54:30 +0000 (22:54 +0000)

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

Tue, 8 Oct 2013 22:54:31 +0000 (22:54 +0000)
author Winson Chung <winsonc@google.com>
Tue, 8 Oct 2013 22:54:30 +0000 (22:54 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 8 Oct 2013 22:54:31 +0000 (22:54 +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>
	Tue, 8 Oct 2013 22:54:30 +0000 (22:54 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 8 Oct 2013 22:54:31 +0000 (22:54 +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