Andreas Shimokawa dafdb1008d Merge branch 'master' into feature-weather		2016-05-16 14:15:39 +02:00
..
main	Merge branch 'master' into feature-weather	2016-05-16 14:15:39 +02:00
test/java/nodomain/freeyourgadget/gadgetbridge	Fix testcases (all this should be scrapped and redone with e.g. robolectric)	2016-04-29 21:58:08 +02:00