Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
# android/app/build.gradle.kts
# android/app/src/main/res/mipmap-hdpi/ic_launcher.png
# android/app/src/main/res/mipmap-mdpi/ic_launcher.png
# android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
# android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
# android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
# android/app/src/main2/res/mipmap-hdpi/ic_launcher.png
# android/app/src/main2/res/mipmap-mdpi/ic_launcher.png
# android/app/src/main2/res/mipmap-xhdpi/ic_launcher.png
# android/app/src/main2/res/mipmap-xxhdpi/ic_launcher.png
# android/app/src/main2/res/mipmap-xxxhdpi/ic_launcher.png
# android/build/reports/problems/problems-report.html
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/theme/colors.dart
# package/device_calendar_plus/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
# package/device_calendar_plus/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
# package/device_calendar_plus/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
# package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
# package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
# pubspec.yaml
|