Merge branch 'android' of git.nikiroo.be:git/fanfix into android
[fanfix.git] / android / app /
drwxr-xr-x   ..
-rw-r--r-- 965 build.gradle.base
-rw-r--r-- 751 proguard-rules.pro