From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 29 Oct 2015 17:29:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/switchOfflineFiles' into beta
X-Git-Tag: beta-20151122~88
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/32ea46eb23d956f89d783aac72000470f5abf4ac?ds=inline;hp=--cc

Merge remote-tracking branch 'remotes/upstream/switchOfflineFiles' into beta
---

32ea46eb23d956f89d783aac72000470f5abf4ac
diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 5a40b29c,7b082eac..79a44088
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@@ -37,9 -34,8 +37,10 @@@ import android.view.View
  import android.widget.AdapterView;
  import android.widget.AdapterView.AdapterContextMenuInfo;
  import android.widget.PopupMenu;
 +import android.widget.TextView;
 +import android.widget.Toast;
  
+ import com.owncloud.android.MainApp;
  import com.owncloud.android.R;
  import com.owncloud.android.authentication.AccountUtils;
  import com.owncloud.android.datamodel.FileDataStorageManager;