Merge "Fix issue where overview panel was taking clicks because it was visible (issue...

author Adam Cohen <adamcohen@google.com>

Wed, 25 Sep 2013 00:16:55 +0000 (00:16 +0000)

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

Wed, 25 Sep 2013 00:16:55 +0000 (00:16 +0000)
author Adam Cohen <adamcohen@google.com>
Wed, 25 Sep 2013 00:16:55 +0000 (00:16 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 25 Sep 2013 00:16:55 +0000 (00:16 +0000)
diff --cc src/com/android/launcher3/AppsCustomizeTabHost.java
Simple merge
diff --cc src/com/android/launcher3/Workspace.java
Simple merge
author	Adam Cohen <adamcohen@google.com>
	Wed, 25 Sep 2013 00:16:55 +0000 (00:16 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 25 Sep 2013 00:16:55 +0000 (00:16 +0000)
		1	2
src/com/android/launcher3/AppsCustomizeTabHost.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/Workspace.java	patch \|	diff1 \|	diff2 \|	blob \| history