Merge "Remove settings in overview mode for Launcher3." into jb-ub-now-kermit

author Jorim Jaggi <jjaggi@google.com>

Wed, 15 Jan 2014 01:31:13 +0000 (01:31 +0000)

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

Wed, 15 Jan 2014 01:31:13 +0000 (01:31 +0000)
author Jorim Jaggi <jjaggi@google.com>
Wed, 15 Jan 2014 01:31:13 +0000 (01:31 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 15 Jan 2014 01:31:13 +0000 (01:31 +0000)
diff --cc src/com/android/launcher3/DeviceProfile.java
Simple merge
diff --cc src/com/android/launcher3/Launcher.java
Simple merge
author	Jorim Jaggi <jjaggi@google.com>
	Wed, 15 Jan 2014 01:31:13 +0000 (01:31 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 15 Jan 2014 01:31:13 +0000 (01:31 +0000)
		1	2
src/com/android/launcher3/DeviceProfile.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/Launcher.java	patch \|	diff1 \|	diff2 \|	blob \| history