Johannes Mockenhaupt 0e61032dec Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: wear update RS create bond add scrollview QuickWizard detailed settings # Conflicts: # app/src/main/res/values/strings.xml		2017-12-27 18:19:51 +01:00
..
assets	Log full class name (not just filename), so logs can be filtered by package name.	2017-12-06 11:53:51 +01:00
java	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-12-27 18:19:51 +01:00
jniLibs	initial RS work	2017-09-13 00:35:03 +02:00
res	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2017-12-27 18:19:51 +01:00
AndroidManifest.xml	Remove combo pairing stubs.	2017-12-03 22:47:55 +01:00