# Conflicts: # Launcher3/AndroidManifest.xml # Launcher3/res/values/strings.xml # Launcher3/src/com/android/launcher3/Launcher.java # Launcher3/src/com/android/launcher3/function/pwd/PwdPinSetPwdActivity.java # Launcher3/src/com/android/launcher3/function/setting/SettingAdminActivity.kt # Launcher3/src/com/android/launcher3/settings/BlankActivity.java # lib_common/src/main/java/com/secspace/lib/common/function/SwitchOutMdm.kt
