Merge "Support for dynamically adding/removing -1 screen" into jb-ub-now-indigo-rose

author Dave Hawkey <dhawkey@google.com>

Thu, 19 Sep 2013 17:16:32 +0000 (17:16 +0000)

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

Thu, 19 Sep 2013 17:16:32 +0000 (17:16 +0000)
author Dave Hawkey <dhawkey@google.com>
Thu, 19 Sep 2013 17:16:32 +0000 (17:16 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 19 Sep 2013 17:16:32 +0000 (17:16 +0000)
diff --cc src/com/android/launcher3/Launcher.java
Simple merge
diff --cc src/com/android/launcher3/Workspace.java
Simple merge
author	Dave Hawkey <dhawkey@google.com>
	Thu, 19 Sep 2013 17:16:32 +0000 (17:16 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 19 Sep 2013 17:16:32 +0000 (17:16 +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