59436419 a4043eab83 Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/java/org/schabi/newpipe/Themer.java # app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java # app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java # app/src/main/res/layout-v18/fragment_videoitem_detail.xml # app/src/main/res/layout/fragment_videoitem_detail.xml # app/src/main/res/xml/settings.xml		2017-01-17 16:18:00 +05:30
..
androidTest/java/org/schabi/newpipe	fixed Downloader.getInstance() in unit tests	2016-12-24 17:11:29 +01:00
main	Merge remote-tracking branch 'origin/master'	2017-01-17 16:18:00 +05:30