Commit 7a867662 authored by alex's avatar alex

Merge branch 'master' into 'develop-alex'

# Conflicts:
#   app/build.gradle
#   app/src/main/java/com/virjar/majora/adr/KeepAliveService.java
#   app/src/main/java/com/virjar/majora/adr/MainActivity.java
#   app/src/main/java/com/virjar/majora/adr/Shell.java
#   app/src/main/java/com/virjar/majora/adr/TheApp.java
#   app/src/main/res/layout/activity_main.xml
parents 5ade52ec b1fdd507
apply plugin: 'com.android.application'
android {
compileSdkVersion 29
compileSdkVersion 26
defaultConfig {
......
File mode changed from 100644 to 100755
......@@ -30,7 +30,6 @@ public class TheApp extends Application {
@Override
public void run() {
Shell.executeCmd("pwd");
}
}.start();
KeepAliveService.startService(this);
......
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment