diff options
author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-10-21 01:03:45 -0700 |
---|---|---|
committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-10-21 01:03:45 -0700 |
commit | 5e43d1ea5436af16f227a98fee495f707c885a96 (patch) | |
tree | 072b13f104cf2da87db80b0a6b78214139ae0618 /src/se/leap/openvpn/OpenVpnManagementThread.java | |
parent | f49967fb3f24bf0a22d09b5823bd174a45e758f7 (diff) | |
parent | f21030aacec6b7f36ea1b8adc86769e3f0b8a9ad (diff) |
Merge branch 'release-0.2.1'0.2.1
Diffstat (limited to 'src/se/leap/openvpn/OpenVpnManagementThread.java')
-rw-r--r-- | src/se/leap/openvpn/OpenVpnManagementThread.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/se/leap/openvpn/OpenVpnManagementThread.java b/src/se/leap/openvpn/OpenVpnManagementThread.java index 43d4f701..028c6ec7 100644 --- a/src/se/leap/openvpn/OpenVpnManagementThread.java +++ b/src/se/leap/openvpn/OpenVpnManagementThread.java @@ -17,7 +17,8 @@ import javax.crypto.BadPaddingException; import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
-import se.leap.leapclient.R;
+
+import se.leap.bitmaskclient.R;
import android.content.SharedPreferences;
import android.net.LocalServerSocket;
|