Dmitriy Karpushin 39736e865e Merge branch 'feature/android_qt6_moving' into feature/android_bandwidth_counter ... # Conflicts: # client/platforms/android/android_controller.cpp # client/platforms/android/android_controller.h		2023-01-19 14:09:12 +03:00
..
android_controller.cpp	Merge branch 'feature/android_qt6_moving' into feature/android_bandwidth_counter	2023-01-19 14:09:12 +03:00
android_controller.h	Merge branch 'feature/android_qt6_moving' into feature/android_bandwidth_counter	2023-01-19 14:09:12 +03:00
android_notificationhandler.cpp	AndroidController reimpl	2021-11-26 17:43:02 +03:00
android_notificationhandler.h	AndroidController reimpl	2021-11-26 17:43:02 +03:00
androidutils.cpp	Added missing files	2022-12-27 11:10:01 +03:00
androidutils.h	Added missing files	2022-12-27 11:10:01 +03:00
androidvpnactivity.cpp	Little cleanup	2023-01-18 15:54:19 +03:00
androidvpnactivity.h	Added missing files	2022-12-27 11:10:01 +03:00