diff options
| author | danielnelz <daniel.nelz@outlook.com> | 2015-03-09 20:25:03 +0100 |
|---|---|---|
| committer | danielnelz <daniel.nelz@outlook.com> | 2015-03-09 20:25:03 +0100 |
| commit | 704821a8db88c765964a48ad207cad4154e2e535 (patch) | |
| tree | 7e3b72c88ae76711ada8b27bb13bc7322501437e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java | |
| parent | 7d27faf00c42ce1ad6311c5fadc37c62ba999150 (diff) | |
| parent | cc66435e38248880fee3af795619b5794b65d222 (diff) | |
| download | open-keychain-704821a8db88c765964a48ad207cad4154e2e535.tar.gz open-keychain-704821a8db88c765964a48ad207cad4154e2e535.tar.bz2 open-keychain-704821a8db88c765964a48ad207cad4154e2e535.zip | |
Merge remote-tracking branch 'upstream/development' into development
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java index f8db03873..35dfcb87c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java @@ -23,7 +23,6 @@ import android.content.Intent; import android.os.Bundle; import android.os.Message; import android.os.Messenger; -import android.os.PersistableBundle; import android.view.View; import org.openintents.openpgp.util.OpenPgpApi; |