695970e069
# Conflicts: # app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java # app/src/main/java/org/schabi/newpipe/player/Player.java # app/src/main/res/layout/player.xml # app/src/main/res/values-so/strings.xml |
||
---|---|---|
.. | ||
schemas/org.schabi.newpipe.database.AppDatabase | ||
src | ||
.gitignore | ||
build.gradle | ||
proguard-rules.pro |