From: masensio <masensio@solidgear.es>
Date: Thu, 19 Feb 2015 12:02:53 +0000 (+0100)
Subject: Merge branch 'develop' into enable_cookies
X-Git-Tag: oc-android-1.7.1_signed^2~42^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0a03b6d3d46b20773e5c2b0548557ae4dd3cc260

Merge branch 'develop' into enable_cookies

Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
---

0a03b6d3d46b20773e5c2b0548557ae4dd3cc260
diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 9c42f276,8d7182d7..ed686140
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -1596,6 -1546,9 +1594,7 @@@ public class AuthenticatorActivity exte
      /**
       * Updates the content and visibility state of the icon and text associated
       * to the last check on the ownCloud server.
 -     * 
 -     * @param serverStatusText      Resource identifier of the text to show.
 -     * @param serverStatusIcon      Resource identifier of the icon to show.
++     *
       */
      private void showServerStatus() {
          if (mServerStatusIcon == 0 && mServerStatusText == 0) {