From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 13 Aug 2015 15:58:58 +0000 (+0200)
Subject: Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_... 
X-Git-Tag: beta-20151128~7^2~63
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/bbd529289cbef2d9e5ffed19fb012417d5ece946?hp=ba3bc9cbfde0092d4971b7791861d8f78df90ff4

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

diff --git a/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java b/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java
index c44b0435..7dfb38b0 100644
--- a/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java
@@ -20,6 +20,7 @@ import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 
 /*
  * Base class for implementing an Activity that is used to help implement an AbstractAccountAuthenticator. 
@@ -32,7 +33,7 @@ import android.support.v7.app.ActionBarActivity;
  * then error AccountManager.ERROR_CODE_CANCELED will be called on the response.
  */
 
-public class AccountAuthenticatorActivity extends ActionBarActivity {
+public class AccountAuthenticatorActivity extends AppCompatActivity {
 
     private AccountAuthenticatorResponse mAccountAuthenticatorResponse = null;
     private Bundle mResultBundle = null;