solohsu 1a7957e2ad Merge branch 'master' into android_r ... # Conflicts: # appveyor.yml # edxp-core/build.gradle # edxp-core/src/main/cpp/external/yahfa/src/HookMain.c # edxp-core/src/main/cpp/external/yahfa/src/env.h # edxp-core/src/main/cpp/main/include/android_build.h # edxp-core/src/main/cpp/main/include/art/runtime/oat_file_manager.h # edxp-core/src/main/cpp/main/include/config.h # edxp-core/src/main/cpp/main/src/native_hook.cpp		2020-08-01 22:24:48 +08:00
..
misc/EdXposedUninstaller	Use different Magisk module ID for each variant	2019-05-14 23:46:26 +08:00
src/main	Merge branch 'master' into android_r	2020-08-01 22:24:48 +08:00
template_override	Merge branch 'master' into android_r	2020-08-01 22:24:48 +08:00
tpl	Bump to 91: multi-user support	2020-03-26 00:02:03 +08:00
.gitignore	Android R: fix bootloop	2020-04-27 17:16:19 +08:00
build.gradle	Bump version	2020-07-31 11:26:48 +08:00