Merge branch 'master' into dev

This commit is contained in:
2018-06-04 19:56:09 -05:00
50 changed files with 1017 additions and 365 deletions

View File

@@ -74,6 +74,11 @@
android:title="@string/led_notifications"
android:summary="@string/led_notifications_description"/>
<Preference
android:key="reminderCustomize"
android:summary="@string/customize_notification_summary"
android:title="@string/customize_notification"/>
</PreferenceCategory>
<PreferenceCategory