Conflicts: app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java app/src/main/java/org/schabi/newpipe/player/PlayerService.java app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java build.gradle
Conflicts: app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java app/src/main/java/org/schabi/newpipe/player/PlayerService.java app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java build.gradle