Christian Schabesberger 9484a5e2ee fix conflict		2018-04-14 11:02:31 +02:00
..
org/schabi/newpipe	fix conflict	2018-04-14 11:02:31 +02:00
us/shandian/giga	Fixes ClassCastException when getting Bitmap from AdaptiveIcon on Android 8+	2017-11-06 12:27:10 +00:00