diff options
author | cyberta <cyberta@riseup.net> | 2020-03-17 08:15:56 -0700 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2020-03-17 08:15:56 -0700 |
commit | e0fb2a88c633908bba9e465e1bf1e19a4a5686e6 (patch) | |
tree | 781613cce835be44ea86178f8af6cb60a84a703e /app/src/main/java/se/leap/bitmaskclient/BitmaskApp.java | |
parent | 05205190ee65a5fa14f18d12f86f5427368bea44 (diff) | |
parent | cea55aaaab23a74dc790afca12671303fc344f97 (diff) |
Merge branch 'androidx' into 'master'
Androidx
See merge request leap/bitmask_android!103
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/BitmaskApp.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/BitmaskApp.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/BitmaskApp.java b/app/src/main/java/se/leap/bitmaskclient/BitmaskApp.java index 48910fb5..bde5114b 100644 --- a/app/src/main/java/se/leap/bitmaskclient/BitmaskApp.java +++ b/app/src/main/java/se/leap/bitmaskclient/BitmaskApp.java @@ -2,8 +2,8 @@ package se.leap.bitmaskclient; import android.content.Context; import android.content.SharedPreferences; -import android.support.multidex.MultiDexApplication; -import android.support.v7.app.AppCompatDelegate; +import androidx.multidex.MultiDexApplication; +import androidx.appcompat.app.AppCompatDelegate; import com.squareup.leakcanary.LeakCanary; import com.squareup.leakcanary.RefWatcher; |