abettenburg 51399066a4 Merge remote-tracking branch 'upstream/master' into black_whitelist_for_notifications ... # Conflicts: # app/src/main/res/values/strings.xml		2019-01-12 09:55:53 +01:00
..
activities	Merge remote-tracking branch 'upstream/master' into black_whitelist_for_notifications	2019-01-12 09:55:53 +01:00
adapter	Merge remote-tracking branch 'upstream/master' into black_whitelist_for_notifications	2019-01-12 09:55:53 +01:00
contentprovider	Update license headers	2018-02-26 14:27:33 +01:00
database	Improved DB-based alarms	2019-01-07 01:15:49 +01:00
deviceevents	Pebble: fix non-working SMS reply regression	2018-11-01 19:12:43 +01:00
devices	remove supportsAlarmConfiguration() in favor of getAlarmSlotCount()	2019-01-11 23:26:00 +01:00
entities	Update license headers	2018-02-26 14:27:33 +01:00
export	Fix some file closing issues	2018-09-15 23:54:51 +02:00
externalevents	Merge remote-tracking branch 'upstream/master' into black_whitelist_for_notifications	2019-01-12 09:55:53 +01:00
impl	Improved DB-based alarms	2019-01-07 01:15:49 +01:00
model	Improved DB-based alarms	2019-01-07 01:15:49 +01:00
service	Catch SecurityException when Notfication access was not granted when getting media session	2019-01-10 17:30:49 +01:00
util	Update LanguageUtils.java	2019-01-11 22:28:36 +01:00
GBApplication.java	emoji: do a lazy initialisation	2018-12-23 23:39:09 +01:00
GBEnvironment.java	Update license headers	2018-02-26 14:27:33 +01:00
GBException.java	Update license headers	2018-02-26 14:27:33 +01:00
LockHandler.java	Update license headers	2018-06-25 18:35:46 +02:00
Logging.java	Update contributors list and license headers.	2018-08-29 21:30:23 +02:00
LoggingExceptionHandler.java	Update license headers	2018-02-26 14:27:33 +01:00
SleepAlarmWidget.java	Improved toast messages for sleep widget	2019-01-11 00:03:17 +01:00