Christian Schabesberger f451f1f65d resolve conflict		2018-01-20 18:06:34 +01:00
..
org/schabi/newpipe	resolve conflict	2018-01-20 18:06:34 +01:00
us/shandian/giga	Fixes ClassCastException when getting Bitmap from AdaptiveIcon on Android 8+	2017-11-06 12:27:10 +00:00