Daniele Gobbetti f66f765fb6 Merge remote-tracking branch 'origin/master' into background-javascript ... # Conflicts: # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java		2017-01-28 17:43:34 +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	Pebble: webview. Implement two way communication with JS.	2017-01-03 15:04:51 +01:00
java	Merge remote-tracking branch 'origin/master' into background-javascript	2017-01-28 17:43:34 +01:00
res	Merge remote-tracking branch 'origin/master' into background-javascript	2017-01-28 17:43:34 +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	Pebble: make the text in the dummy weather configuration activity visible.	2017-01-15 18:19:30 +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