Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d469b7fd authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

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

parents 5ea422e3 a6631d76

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);

    }