Merge "Adjusting grid for tablets and fixing incorrect resources for large tablets...

author Winson Chung <winsonc@google.com>

Thu, 12 Dec 2013 00:35:47 +0000 (00:35 +0000)

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

Thu, 12 Dec 2013 00:35:47 +0000 (00:35 +0000)
author Winson Chung <winsonc@google.com>
Thu, 12 Dec 2013 00:35:47 +0000 (00:35 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 12 Dec 2013 00:35:47 +0000 (00:35 +0000)
diff --cc src/com/android/launcher3/CellLayout.java
Simple merge
diff --cc src/com/android/launcher3/Workspace.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Thu, 12 Dec 2013 00:35:47 +0000 (00:35 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 12 Dec 2013 00:35:47 +0000 (00:35 +0000)
		1	2
src/com/android/launcher3/CellLayout.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/Workspace.java	patch \|	diff1 \|	diff2 \|	blob \| history