Sylvain Becker 42e18bd0c2 Android: fix bad merge from previous commit		2019-01-11 14:25:32 +01:00
..
jni	Updated Android project files and documentation	2018-10-28 10:31:06 -07:00
src/main	Android: fix bad merge from previous commit	2019-01-11 14:25:32 +01:00
build.gradle	Updated Android project files and documentation	2018-10-28 10:31:06 -07:00
proguard-rules.pro	Switched to new style gradle Android application build process	2017-10-23 15:23:43 -07:00