diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-05 14:37:09 +0300 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-05 14:37:09 +0300 |
| commit | da92e5f3767d59e2e6c2671d7df4aefe390cf5e2 (patch) | |
| tree | f5a1d9e3d94bb1067d24f7cf89de26430e091d77 /OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/BenchmarkOperationTest.java | |
| parent | 6b7a0597af7aa42b375ca34d8a47515fa8adcc9f (diff) | |
| parent | eeb6fa5755c77f2e82b7b23a3cd98a17e09b6392 (diff) | |
| download | open-keychain-da92e5f3767d59e2e6c2671d7df4aefe390cf5e2.tar.gz open-keychain-da92e5f3767d59e2e6c2671d7df4aefe390cf5e2.tar.bz2 open-keychain-da92e5f3767d59e2e6c2671d7df4aefe390cf5e2.zip | |
Merge branch 'AlexFJW-StrippedChangePass'
Diffstat (limited to 'OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/BenchmarkOperationTest.java')
| -rw-r--r-- | OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/BenchmarkOperationTest.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/BenchmarkOperationTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/BenchmarkOperationTest.java index 175b7687d..381c7a490 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/BenchmarkOperationTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/BenchmarkOperationTest.java @@ -50,7 +50,6 @@ import org.sufficientlysecure.keychain.service.CertifyActionsParcel; import org.sufficientlysecure.keychain.service.CertifyActionsParcel.CertifyAction; import org.sufficientlysecure.keychain.service.SaveKeyringParcel; import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm; -import org.sufficientlysecure.keychain.service.SaveKeyringParcel.ChangeUnlockParcel; import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; import org.sufficientlysecure.keychain.util.Passphrase; import org.sufficientlysecure.keychain.util.ProgressScaler; |