Merge "Initial changes to support smaller landscape layouts." into jb-ub-now-jetsonic

author Winson Chung <winsonc@google.com>

Tue, 29 Oct 2013 01:33:59 +0000 (01:33 +0000)

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

Tue, 29 Oct 2013 01:34:00 +0000 (01:34 +0000)
author Winson Chung <winsonc@google.com>
Tue, 29 Oct 2013 01:33:59 +0000 (01:33 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 29 Oct 2013 01:34:00 +0000 (01:34 +0000)
diff --cc src/com/android/launcher3/BubbleTextView.java
Simple merge
diff --cc src/com/android/launcher3/Folder.java
Simple merge
diff --cc src/com/android/launcher3/Launcher.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Tue, 29 Oct 2013 01:33:59 +0000 (01:33 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 29 Oct 2013 01:34:00 +0000 (01:34 +0000)
		1	2
src/com/android/launcher3/BubbleTextView.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/Folder.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/Launcher.java	patch \|	diff1 \|	diff2 \|	blob \| history