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 pull request #186 from owncloud/fixed_contradicted_messages_in_login_view
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
syncadapter
/
ContactSyncAdapter.java
diff --git
a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
index
0687146
..
b82a400
100644
(file)
--- a/
src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
+++ b/
src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
@@
-25,7
+25,7
@@
import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.ByteArrayEntity;
import com.owncloud.android.AccountUtils;
import org.apache.http.entity.ByteArrayEntity;
import com.owncloud.android.AccountUtils;
-import com.owncloud.android.authenticat
or
.AccountAuthenticator;
+import com.owncloud.android.authenticat
ion
.AccountAuthenticator;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.Account;
import android.accounts.AccountManager;