Merge "Don't notifyPageSwitchListener until page settles (issue 12069757)" into jb...

author Adam Cohen <adamcohen@google.com>

Fri, 13 Dec 2013 23:59:53 +0000 (23:59 +0000)

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

Fri, 13 Dec 2013 23:59:53 +0000 (23:59 +0000)
author Adam Cohen <adamcohen@google.com>
Fri, 13 Dec 2013 23:59:53 +0000 (23:59 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 13 Dec 2013 23:59:53 +0000 (23:59 +0000)
diff --cc src/com/android/launcher3/PagedView.java
Simple merge
diff --cc src/com/android/launcher3/Workspace.java
Simple merge
author	Adam Cohen <adamcohen@google.com>
	Fri, 13 Dec 2013 23:59:53 +0000 (23:59 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 13 Dec 2013 23:59:53 +0000 (23:59 +0000)
		1	2
src/com/android/launcher3/PagedView.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/Workspace.java	patch \|	diff1 \|	diff2 \|	blob \| history