# Conflicts: # app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java # app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java # app/src/main/java/org/schabi/newpipe/util/BitmapUtils.java # app/src/main/res/xml/video_audio_settings.xml |
||
|---|---|---|
| .. | ||
| androidTest/java/org/schabi/newpipe/report | ||
| debug | ||
| main | ||
| test | ||