straw/app/src
k1rakishou 835476870b Merge remote-tracking branch 'push_here/(#1570)-lock-screen-video-thumbnail' into (#1570)-lock-screen-video-thumbnail
# 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
2020-01-03 12:56:01 +03:00
..
androidTest/java/org/schabi/newpipe/report Migrate to AndroidX 2019-10-04 14:59:08 +02:00
debug Use new Localization and Downloader implementations from extractor 2019-11-17 23:58:52 -03:00
main Merge remote-tracking branch 'push_here/(#1570)-lock-screen-video-thumbnail' into (#1570)-lock-screen-video-thumbnail 2020-01-03 12:56:01 +03:00
test Fix mess with tab handling and enable ignored tests again 2019-11-20 00:23:29 -03:00