Merge "Small refactor to separate adding workspace / all apps items" into ub-now...

author Adam Cohen <adamcohen@google.com>

Wed, 5 Feb 2014 22:25:41 +0000 (22:25 +0000)

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

Wed, 5 Feb 2014 22:25:41 +0000 (22:25 +0000)
author Adam Cohen <adamcohen@google.com>
Wed, 5 Feb 2014 22:25:41 +0000 (22:25 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 5 Feb 2014 22:25:41 +0000 (22:25 +0000)
diff --cc src/com/android/launcher3/Launcher.java
Simple merge
diff --cc src/com/android/launcher3/LauncherModel.java
Simple merge
author	Adam Cohen <adamcohen@google.com>
	Wed, 5 Feb 2014 22:25:41 +0000 (22:25 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 5 Feb 2014 22:25:41 +0000 (22:25 +0000)
		1	2
src/com/android/launcher3/Launcher.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/LauncherModel.java	patch \|	diff1 \|	diff2 \|	blob \| history