diff options
author | Ashley Hughes <spirit.returned@gmail.com> | 2014-03-29 13:21:39 +0000 |
---|---|---|
committer | Ashley Hughes <spirit.returned@gmail.com> | 2014-03-29 13:21:39 +0000 |
commit | e1d07214dfe12f893aa4052e08dbc3025f5cb67d (patch) | |
tree | ef945347e987806f4f448e32671c039345985356 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java | |
parent | 7a2d880c4db21ab62cb152f10d1938a36319acb3 (diff) | |
parent | 68668fd444b973502b91b7cbe0cf7dbdd8a8b5c4 (diff) | |
download | open-keychain-e1d07214dfe12f893aa4052e08dbc3025f5cb67d.tar.gz open-keychain-e1d07214dfe12f893aa4052e08dbc3025f5cb67d.tar.bz2 open-keychain-e1d07214dfe12f893aa4052e08dbc3025f5cb67d.zip |
merge master
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java')
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java index b850638a6..741530b1d 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java @@ -17,9 +17,6 @@ package org.sufficientlysecure.keychain.ui.dialog; -import org.sufficientlysecure.htmltextview.HtmlTextView; -import org.sufficientlysecure.keychain.R; - import android.annotation.TargetApi; import android.app.AlertDialog; import android.app.Dialog; @@ -31,6 +28,8 @@ import android.os.Bundle; import android.provider.Settings; import android.support.v4.app.DialogFragment; import android.support.v4.app.FragmentActivity; +import org.sufficientlysecure.htmltextview.HtmlTextView; +import org.sufficientlysecure.keychain.R; @TargetApi(Build.VERSION_CODES.JELLY_BEAN) public class ShareNfcDialogFragment extends DialogFragment { @@ -97,4 +96,4 @@ public class ShareNfcDialogFragment extends DialogFragment { return alert.create(); } -}
\ No newline at end of file +} |