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
..
info/nightscout/androidaps	Merge remote-tracking branch 'origin/dev' into watch_strings	2019-12-05 18:26:57 +01:00