Merge "Accessibility: Folder drag and drop fixes" into ub-launcher3-burnaby

author Sunny Goyal <sunnygoyal@google.com>

Mon, 11 May 2015 18:54:11 +0000 (18:54 +0000)

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

Mon, 11 May 2015 18:54:11 +0000 (18:54 +0000)
author Sunny Goyal <sunnygoyal@google.com>
Mon, 11 May 2015 18:54:11 +0000 (18:54 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 11 May 2015 18:54:11 +0000 (18:54 +0000)
diff --cc src/com/android/launcher3/FolderPagedView.java
Simple merge
author	Sunny Goyal <sunnygoyal@google.com>
	Mon, 11 May 2015 18:54:11 +0000 (18:54 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 11 May 2015 18:54:11 +0000 (18:54 +0000)