Christian Schabesberger 8adca3725d solve merge conflict		2018-02-14 21:06:20 +01:00
..
org/schabi/newpipe	solve merge conflict	2018-02-14 21:06:20 +01:00
us/shandian/giga	Fixes ClassCastException when getting Bitmap from AdaptiveIcon on Android 8+	2017-11-06 12:27:10 +00:00