Daniele Gobbetti 3356a4b066 Merge remote-tracking branch 'origin/master' into low_battery_notification ... Conflicts: app/src/main/res/values/strings.xml		2015-08-26 15:46:33 +02:00
..
.settings	#15 Initial support for MI Band	2015-04-19 02:37:29 +02:00
aidl/com/android/internal/telephony	Support for rejecting/ending calls via Pebble buttons	2015-03-07 17:44:39 +01:00
assets	Remove the activity log debug file.	2015-06-12 22:30:14 +02:00
java/nodomain/freeyourgadget/gadgetbridge	Merge remote-tracking branch 'origin/master' into low_battery_notification	2015-08-26 15:46:33 +02:00
res	Merge remote-tracking branch 'origin/master' into low_battery_notification	2015-08-26 15:46:33 +02:00
.classpath	#15 Initial support for MI Band	2015-04-19 02:37:29 +02:00
.project	#15 Initial support for MI Band	2015-04-19 02:37:29 +02:00
AndroidManifest.xml	try to make telephony optional	2015-08-22 22:52:29 +02:00
lint.xml	#15 Initial support for MI Band	2015-04-19 02:37:29 +02:00
project.properties	#15 Initial support for MI Band	2015-04-19 02:37:29 +02:00