resolve merge conflicts of 4530aca9 to ub-launcher3-master.

Change-Id: I55a0cd751cbcce8fcc8efa23a0a88a01ec08522b

WallpaperPicker/src/com/android/launcher3/wallpapertileinfo/DefaultWallpaperInfo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ public class DefaultWallpaperInfo extends DrawableThumbWallpaperInfo {

		@Override
		public float getParallaxOffset() {
		return 0;
		return 0.5f;
		}
		}, null);
		}