Christian Schabesberger 7d6b92e064 Merge branch 'feature-improve-search-fragment' of git://github.com/coffeemakr/NewPipe into cofe		2017-01-22 14:42:36 +01:00
..
androidTest/java/org/schabi/newpipe	fixed Downloader.getInstance() in unit tests	2016-12-24 17:11:29 +01:00
main	Merge branch 'feature-improve-search-fragment' of git://github.com/coffeemakr/NewPipe into cofe	2017-01-22 14:42:36 +01:00
test/java	resolve conflict	2017-01-22 14:26:01 +01:00