Daniele Gobbetti 6c993d40aa Merge branch 'master' into background-javascript ... # Conflicts: # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java		2017-02-25 15:26:55 +01: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	Merge branch 'master' into background-javascript	2017-02-25 15:26:55 +01:00
java	Merge branch 'master' into background-javascript	2017-02-25 15:26:55 +01:00
res	Merge branch 'master' into background-javascript	2017-02-25 13:02:07 +01: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	Automatically start the service on boot (can be turned off)	2017-02-17 23:24:44 +01: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