polymorphicshade 146601da40 Merge branch 'master' into sponsorblock ... # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java # app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java # app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java # app/src/main/java/org/schabi/newpipe/player/Player.java # app/src/main/java/us/shandian/giga/get/Mission.java # app/src/main/res/values-so/strings.xml # app/src/main/res/values/strings.xml		2021-07-24 18:15:04 -06:00
..
androidx/fragment/app	Lint: Make a bunch of stuff final	2020-11-18 17:50:00 -05:00
com/google/android/material/appbar	Annotate some overridden methods and parameters as NonNull	2021-06-19 18:37:02 -04:00
org/schabi/newpipe	Merge branch 'master' into sponsorblock	2021-07-24 18:15:04 -06:00
us/shandian/giga	Merge branch 'master' into sponsorblock	2021-07-24 18:15:04 -06:00