Gadgetbridge/app/src/main/java
Daniele Gobbetti 6ebc727f97 Merge remote-tracking branch 'origin/master' into low_battery_notification
Conflicts:
	app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
2015-08-24 17:48:17 +02:00
..
nodomain/freeyourgadget/gadgetbridge Merge remote-tracking branch 'origin/master' into low_battery_notification 2015-08-24 17:48:17 +02:00