From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 24 Oct 2014 16:44:04 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into
X-Git-Tag: oc-android-1.7.0_signed~126^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ec19a11a385ff21d3e85a94e618d48d8be9ef20d

Merge remote-tracking branch 'upstream/develop' into
bugfixMultipleSelect

Conflicts:
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
---

ec19a11a385ff21d3e85a94e618d48d8be9ef20d
diff --cc project.properties
index c9e58408,28edd993..3c67d777
--- a/project.properties
+++ b/project.properties
@@@ -10,3 -10,4 +10,5 @@@
  # Project target.
  target=android-19
  android.library.reference.1=actionbarsherlock/library
+ android.library.reference.2=owncloud-android-library
++android.library.reference.3=../android-library/android-library
diff --cc src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
index 9eb7d1da,a9b6ad2c..c9408b1e
--- a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
@@@ -18,12 -18,7 +18,8 @@@
  package com.owncloud.android.ui.fragment;
  
  import java.io.File;
 +import java.util.ArrayList;
  
- import com.owncloud.android.Log_OC;
- import com.owncloud.android.R;
- import com.owncloud.android.ui.adapter.LocalFileListAdapter;
- 
  import android.app.Activity;
  import android.os.Bundle;
  import android.os.Environment;