From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 13 May 2012 14:19:22 +0000 (+0200)
Subject: merge fix
X-Git-Tag: oc-android-1.4.3~426
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/390949b8323633b26d56b3a837e83941cbc24b4b?ds=inline

merge fix
---

390949b8323633b26d56b3a837e83941cbc24b4b
diff --cc src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index cec268bd,294dbfa6..1db5246e
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@@ -26,14 -28,10 +28,12 @@@ import android.content.ContentResolver
  import android.content.Context;
  import android.content.DialogInterface;
  import android.content.DialogInterface.OnClickListener;
- import android.content.BroadcastReceiver;
- import android.content.ContentResolver;
  import android.content.Intent;
  import android.content.IntentFilter;
 +import android.database.Cursor;
  import android.net.Uri;
  import android.os.Bundle;
 +import android.provider.MediaStore;
  import android.util.Log;
  import android.view.View;
  import android.view.ViewGroup;