Merge "Adding padding to the folder content" into ub-launcher3-burnaby

author Sunny Goyal <sunnygoyal@google.com>

Fri, 15 May 2015 02:21:59 +0000 (02:21 +0000)

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

Fri, 15 May 2015 02:22:00 +0000 (02:22 +0000)
author Sunny Goyal <sunnygoyal@google.com>
Fri, 15 May 2015 02:21:59 +0000 (02:21 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 15 May 2015 02:22:00 +0000 (02:22 +0000)
diff --cc res/layout/user_folder.xml
Simple merge
diff --cc src/com/android/launcher3/FolderPagedView.java
Simple merge
diff --cc src/com/android/launcher3/PagedView.java
Simple merge
author	Sunny Goyal <sunnygoyal@google.com>
	Fri, 15 May 2015 02:21:59 +0000 (02:21 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 15 May 2015 02:22:00 +0000 (02:22 +0000)
		1	2
res/layout/user_folder.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/FolderPagedView.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/PagedView.java	patch \|	diff1 \|	diff2 \|	blob \| history