Johannes Mockenhaupt d54b99c559 Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Cleanup gradle build files Add null check in ConfigBuildPlugin.getTempBasalFromHistory. Avoid race condition checking for an active TBR. Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown). # Conflicts: # app/build.gradle		2018-01-13 23:18:44 +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	2018-01-13 23:18:44 +01:00
jniLibs	initial RS work	2017-09-13 00:35:03 +02:00
res	Merge branch 'combo-strings' into combo-scripter-v2	2018-01-11 21:48:01 +01:00
AndroidManifest.xml	Remove combo pairing stubs.	2017-12-03 22:47:55 +01:00