Merge "Added launcher callback to specify search bar height." into ub-launcher3-burnaby

author Tony Wickham <twickham@google.com>

Fri, 9 Oct 2015 01:37:39 +0000 (01:37 +0000)

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

Fri, 9 Oct 2015 01:37:39 +0000 (01:37 +0000)
author Tony Wickham <twickham@google.com>
Fri, 9 Oct 2015 01:37:39 +0000 (01:37 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 9 Oct 2015 01:37:39 +0000 (01:37 +0000)
diff --cc res/values/dimens.xml
Simple merge
diff --cc src/com/android/launcher3/DeviceProfile.java
Simple merge
author	Tony Wickham <twickham@google.com>
	Fri, 9 Oct 2015 01:37:39 +0000 (01:37 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 9 Oct 2015 01:37:39 +0000 (01:37 +0000)
		1	2
res/values/dimens.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/DeviceProfile.java	patch \|	diff1 \|	diff2 \|	blob \| history