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/de/blinkt/openvpn/core/OpenVPNService.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/de/blinkt/openvpn/core/OpenVPNService.java')
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java index 67d3c4f2..61969769 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java +++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java @@ -24,7 +24,7 @@ import android.os.IBinder; import android.os.Message; import android.os.ParcelFileDescriptor; import android.os.RemoteException; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.system.OsConstants; import android.text.TextUtils; import android.util.Log; |