Philoul c716ac006b Merge remote-tracking branch 'origin/dev' into watch_strings ... # Conflicts: # wear/src/main/res/values/strings.xml		2019-12-05 18:26:57 +01:00
..
androidTest/java/info/nightscout/androidaps	Remove unused test class.	2017-08-28 00:57:47 +02:00
main	Merge remote-tracking branch 'origin/dev' into watch_strings	2019-12-05 18:26:57 +01:00
test	fix test	2019-12-02 21:21:37 +01:00