diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-13 17:30:14 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-13 17:30:14 +0200 |
| commit | 974dc47d699ee78b657021d12ae04c7699a20e82 (patch) | |
| tree | f5df405832a04898c7892ceae541e0ba8d5b41ba /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java | |
| parent | aca9ecdb8542a1f34e2311fff157a8279405b9e0 (diff) | |
| parent | 19252380f198555a6650654ab5e2e35905b40203 (diff) | |
| download | open-keychain-974dc47d699ee78b657021d12ae04c7699a20e82.tar.gz open-keychain-974dc47d699ee78b657021d12ae04c7699a20e82.tar.bz2 open-keychain-974dc47d699ee78b657021d12ae04c7699a20e82.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java index 46a557da3..4bf750121 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java @@ -30,8 +30,7 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.helper.ActionBarHelper; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.remote.AccountSettings; -import org.sufficientlysecure.keychain.service.OperationResultParcel; -import org.sufficientlysecure.keychain.ui.CertifyKeyActivity; +import org.sufficientlysecure.keychain.service.results.OperationResultParcel; import org.sufficientlysecure.keychain.util.Log; public class AccountSettingsActivity extends ActionBarActivity { |