Launcher3/src/com/android/launcher3/App.java · 74e2efc49a107554d2882565b03dd83fa759d61a · Wang Xu / MobileManager

Merge remote-tracking branch 'remotes/origin/education_space' into education_space_26 · 74e2efc4

authored Apr 02, 2020

# 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

74e2efc4

App.java 816 Bytes

Replace App.java