Milos Kozak e71ce02131 fix merge conflict		2017-10-26 21:23:23 +02:00
..
assets	Merge remote-tracking branch 'milosremote/dev' into smb-rhino	2017-10-21 17:06:57 +02:00
java	fix merge conflict	2017-10-26 21:23:23 +02:00
jniLibs	initial RS work	2017-09-13 00:35:03 +02:00
res	fix merge conflict	2017-10-24 11:46:27 +02:00
AndroidManifest.xml	location permission for BLE scanning	2017-10-14 13:36:38 +02:00