diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-14 16:49:12 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-14 16:49:12 +0200 |
| commit | d0c389775a92d5d29a4d116d2218c8ad2475dfd5 (patch) | |
| tree | c01d36114e424f1b5da1b2ed804aea8ea4b03458 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java | |
| parent | 49f3b3780d09141055ff73acdaef1325012029b5 (diff) | |
| parent | bfe36019bd368bb434e77be433f6acb409953b93 (diff) | |
| download | open-keychain-d0c389775a92d5d29a4d116d2218c8ad2475dfd5.tar.gz open-keychain-d0c389775a92d5d29a4d116d2218c8ad2475dfd5.tar.bz2 open-keychain-d0c389775a92d5d29a4d116d2218c8ad2475dfd5.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java index 4eb253825..a990682f6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java @@ -18,7 +18,7 @@ package org.sufficientlysecure.keychain.ui.dialog; import android.app.Activity; -import android.app.AlertDialog; +import android.support.v7.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; |