projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'text_file_preview_pr_707_with_develop' of github.com:owncloud/android...
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
ui
/
dialog
/
CredentialsDialogFragment.java
diff --git
a/src/com/owncloud/android/ui/dialog/CredentialsDialogFragment.java
b/src/com/owncloud/android/ui/dialog/CredentialsDialogFragment.java
index
c12b9dd
..
609f721
100644
(file)
--- a/
src/com/owncloud/android/ui/dialog/CredentialsDialogFragment.java
+++ b/
src/com/owncloud/android/ui/dialog/CredentialsDialogFragment.java
@@
-22,9
+22,9
@@
package com.owncloud.android.ui.dialog;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AuthenticatorActivity;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AuthenticatorActivity;
-import android.app.AlertDialog;
+import android.
support.v7.
app.AlertDialog;
import android.app.Dialog;
import android.app.Dialog;
-import android.app.AlertDialog.Builder;
+import android.
support.v7.
app.AlertDialog.Builder;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;