Merge "Implementing resizable widgets in launcher"

author Adam Cohen <adamcohen@google.com>

Mon, 28 Feb 2011 19:44:33 +0000 (11:44 -0800)

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

Mon, 28 Feb 2011 19:44:33 +0000 (11:44 -0800)
author Adam Cohen <adamcohen@google.com>
Mon, 28 Feb 2011 19:44:33 +0000 (11:44 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 28 Feb 2011 19:44:33 +0000 (11:44 -0800)
diff --cc src/com/android/launcher2/CellLayoutChildren.java
Simple merge
diff --cc src/com/android/launcher2/Workspace.java
Simple merge
author	Adam Cohen <adamcohen@google.com>
	Mon, 28 Feb 2011 19:44:33 +0000 (11:44 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 28 Feb 2011 19:44:33 +0000 (11:44 -0800)
		1	2
src/com/android/launcher2/CellLayoutChildren.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher2/Workspace.java	patch \|	diff1 \|	diff2 \|	blob \| history