Milos Kozak a36b1b2a10 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev		2018-05-02 18:39:47 +02:00
..
androidTest/java/info/nightscout/androidaps	Remove unused test class.	2017-08-28 00:57:47 +02:00
main	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2018-05-02 18:39:47 +02:00
test/java/info	Merge pull request #957 from triplem/charging_merged	2018-05-02 15:04:00 +02:00