Milos Kozak f673d3a721 Merge branch 'dev' into dev2		2017-10-24 21:08:54 +02:00
..
assets	log to debug not error	2017-10-15 23:21:55 +02:00
java	Merge branch 'dev' into dev2	2017-10-24 21:08:54 +02:00
jniLibs	initial RS work	2017-09-13 00:35:03 +02:00
res	fix merge conflict	2017-10-22 21:11:31 +02:00
AndroidManifest.xml	location permission for BLE scanning	2017-10-14 13:36:38 +02:00