ByteHamster 407f92be12 Merge branch 'develop' into api-26-support		2018-05-07 20:02:07 +02:00
..
src	Merge branch 'develop' into api-26-support	2018-05-07 20:02:07 +02:00
.gitignore
build.gradle	Fixed compile error and warning about mixed support versions	2018-05-06 23:15:55 +02:00
proguard-rules.pro