Merge "Updating the UI for focused state of an icon/folder." into ub-now-porkchop

author Sunny Goyal <sunnygoyal@google.com>

Mon, 18 Aug 2014 21:03:57 +0000 (21:03 +0000)

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

Sat, 16 Aug 2014 03:52:42 +0000 (03:52 +0000)
author Sunny Goyal <sunnygoyal@google.com>
Mon, 18 Aug 2014 21:03:57 +0000 (21:03 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 16 Aug 2014 03:52:42 +0000 (03:52 +0000)
diff --cc src/com/android/launcher3/AppsCustomizePagedView.java
Simple merge
diff --cc src/com/android/launcher3/CellLayout.java
Simple merge
diff --cc src/com/android/launcher3/Launcher.java
Simple merge
author	Sunny Goyal <sunnygoyal@google.com>
	Mon, 18 Aug 2014 21:03:57 +0000 (21:03 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 16 Aug 2014 03:52:42 +0000 (03:52 +0000)
		1	2
src/com/android/launcher3/AppsCustomizePagedView.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/CellLayout.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/Launcher.java	patch \|	diff1 \|	diff2 \|	blob \| history