Daniele Gobbetti 5c0c5581bb Merge branch 'master' into background-javascript ... # Conflicts: # app/src/main/assets/app_config/js/gadgetbridge_boilerplate.js # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java		2017-04-08 21:16:01 +02:00
..
arrays.xml	Add privacy mode that hides the phone number (#588)	2017-03-14 21:45:36 +01:00
attrs.xml	Do not override the android:* text colors, define our own. This fixes a crash on API 19.	2017-04-08 15:49:00 +02:00
colors.xml	Do not override the android:* text colors, define our own. This fixes a crash on API 19.	2017-04-08 15:49:00 +02:00
dimens.xml	Use a new GUI for the controlcenter.	2016-10-21 13:01:30 +02:00
strings.xml	Merge branch 'master' into background-javascript	2017-04-08 21:16:01 +02:00
styles.xml	Do not override the android:* text colors, define our own. This fixes a crash on API 19.	2017-04-08 15:49:00 +02:00
values.xml	made caller privacy pebble setting generic	2017-02-07 10:15:23 +01:00