Merge branch 'master' of https://github.com/owncloud/android into material_buttons

[pub/Android/ownCloud.git] / src / com / owncloud / android / authentication / AccountAuthenticatorActivity.java

diff --git a/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java b/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java
index 7dfb38b..78d95e4 100644 (file)
--- a/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java
@@ -19,7 +19,6 @@ package com.owncloud.android.authentication;
 import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;
 import android.os.Bundle;
 import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;
 import android.os.Bundle;

-import android.support.v7.app.ActionBarActivity;

 import android.support.v7.app.AppCompatActivity;
 
 /*
 import android.support.v7.app.AppCompatActivity;
 
 /*