NewPipe-app-android/app/src/main
Christian Schabesberger 72289ced39 Merge branch 'backgroundPlayback' 2015-12-20 18:16:28 +01:00
..
java/org/schabi/newpipe Merge branch 'backgroundPlayback' 2015-12-20 18:16:28 +01:00
res Merge branch 'backgroundPlayback' 2015-12-20 18:16:28 +01:00
AndroidManifest.xml removed accidental 'git merge' command from manifest 2015-12-17 18:01:24 +00:00