Merge "Skip to the end of the folder open animation in battery saver mode." into...

author Tony Wickham <twickham@google.com>

Wed, 25 Nov 2015 00:06:14 +0000 (00:06 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 25 Nov 2015 00:06:14 +0000 (00:06 +0000)
author Tony Wickham <twickham@google.com>
Wed, 25 Nov 2015 00:06:14 +0000 (00:06 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 25 Nov 2015 00:06:14 +0000 (00:06 +0000)
diff --cc src/com/android/launcher3/CellLayout.java
Simple merge
diff --cc src/com/android/launcher3/Launcher.java
Simple merge
diff --cc src/com/android/launcher3/Utilities.java
Simple merge
author	Tony Wickham <twickham@google.com>
	Wed, 25 Nov 2015 00:06:14 +0000 (00:06 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 25 Nov 2015 00:06:14 +0000 (00:06 +0000)
		1	2
src/com/android/launcher3/CellLayout.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/Launcher.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/launcher3/Utilities.java	patch \|	diff1 \|	diff2 \|	blob \| history