# Conflicts: # app/build.gradle # app/src/main/java/org/schabi/newpipe/player/PlayerService.java # app/src/main/res/values-ca/strings.xml
# Conflicts: # app/build.gradle # app/src/main/java/org/schabi/newpipe/player/PlayerService.java # app/src/main/res/values-ca/strings.xml