Christian Schabesberger 8ececc11d2 Merge branch 'master' of github.com:theScrabi/NewPipe		2016-09-12 23:07:31 +02:00
..
java	fix settings updateSummary	2016-09-12 16:22:02 +02:00
res	Merge branch 'master' of github.com:theScrabi/NewPipe	2016-09-12 23:07:31 +02:00
AndroidManifest.xml	fix merge with add_cahnnels	2016-09-12 00:12:00 +02:00