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
..
com/google/android/material/appbar	Migrate to AndroidX	2019-10-04 14:59:08 +02:00
org/schabi/newpipe	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
us/shandian/giga	remove unused imports	2019-12-05 14:04:48 -03:00