aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-05-08 18:44:58 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-05-08 18:44:58 +0200
commitc2b75e3d2e6097a9566a022500b47d6749b13ef7 (patch)
tree86151dec56dcf830992968fe28ec2916f399d35c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
parentaf4f32e2d73ce514cf8f8748b1f0b6430c802fc9 (diff)
parent4ba06e7735eb64c7b3d02c605e8c91fe986c1976 (diff)
downloadopen-keychain-c2b75e3d2e6097a9566a022500b47d6749b13ef7.tar.gz
open-keychain-c2b75e3d2e6097a9566a022500b47d6749b13ef7.tar.bz2
open-keychain-c2b75e3d2e6097a9566a022500b47d6749b13ef7.zip
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index bb5d2e922..35076287b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -38,7 +38,6 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ArrayAdapter;
-import com.beardedhen.androidbootstrap.BootstrapButton;
import com.devspark.appmsg.AppMsg;
import org.sufficientlysecure.keychain.Constants;