Merge "Updating the widget tray" into ub-now-porkchop

author Adam Cohen <adamcohen@google.com>

Mon, 11 Aug 2014 15:42:28 +0000 (15:42 +0000)

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

Sat, 9 Aug 2014 00:40:15 +0000 (00:40 +0000)
author Adam Cohen <adamcohen@google.com>
Mon, 11 Aug 2014 15:42:28 +0000 (15:42 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 9 Aug 2014 00:40:15 +0000 (00:40 +0000)
diff --cc src/com/android/launcher3/AppsCustomizePagedView.java
Simple merge
diff --cc src/com/android/launcher3/Launcher.java
Simple merge
diff --cc src/com/android/launcher3/Workspace.java
Simple merge
author	Adam Cohen <adamcohen@google.com>
	Mon, 11 Aug 2014 15:42:28 +0000 (15:42 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 9 Aug 2014 00:40:15 +0000 (00:40 +0000)
		1	2
src/com/android/launcher3/AppsCustomizePagedView.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/Launcher.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/Workspace.java	patch \|	diff1 \|	diff2 \|	blob \| history