Merge "Cleaning up icon code."

author Winson Chung <winsonc@google.com>

Thu, 5 May 2011 22:41:26 +0000 (15:41 -0700)

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

Thu, 5 May 2011 22:41:26 +0000 (15:41 -0700)
author Winson Chung <winsonc@google.com>
Thu, 5 May 2011 22:41:26 +0000 (15:41 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 5 May 2011 22:41:26 +0000 (15:41 -0700)
diff --cc src/com/android/launcher2/AppsCustomizePagedView.java
Simple merge
diff --cc src/com/android/launcher2/CustomizePagedView.java
Simple merge
diff --cc src/com/android/launcher2/PagedViewIcon.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Thu, 5 May 2011 22:41:26 +0000 (15:41 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 5 May 2011 22:41:26 +0000 (15:41 -0700)
		1	2
src/com/android/launcher2/AppsCustomizePagedView.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher2/CustomizePagedView.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher2/PagedViewIcon.java	patch \|	diff1 \|	diff2 \|	blob \| history