mirror of
https://github.com/topjohnwu/Magisk.git
synced 2024-12-28 10:17:38 +00:00
605faccffd
# Conflicts: # app/build.gradle # app/src/main/java/com/topjohnwu/magisk/App.java # app/src/main/java/com/topjohnwu/magisk/model/adapters/ReposAdapter.java # app/src/main/java/com/topjohnwu/magisk/model/update/UpdateCheckService.java # app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.java # app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.java # app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.java # app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.java # app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.java # app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.java # app/src/main/java/com/topjohnwu/magisk/utils/ValueSortedMap.java # app/src/main/java/com/topjohnwu/magisk/view/dialogs/InstallMethodDialog.java # app/src/main/java/com/topjohnwu/magisk/view/dialogs/MagiskInstallDialog.java # app/src/main/java/com/topjohnwu/magisk/view/dialogs/ManagerInstallDialog.java # build.gradle