From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 13 Nov 2015 16:43:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
X-Git-Tag: beta-20151122~24
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4e162ed4386f4388626b1b6387d54028e2466e1e

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

4e162ed4386f4388626b1b6387d54028e2466e1e
diff --cc src/com/owncloud/android/media/MediaService.java
index 7bd9c0c6,5b865262..d6fbfcc2
--- a/src/com/owncloud/android/media/MediaService.java
+++ b/src/com/owncloud/android/media/MediaService.java
@@@ -39,7 -36,7 +39,8 @@@ import android.net.wifi.WifiManager
  import android.net.wifi.WifiManager.WifiLock;
  import android.os.IBinder;
  import android.os.PowerManager;
 +import android.support.v7.app.AlertDialog;
+ import android.support.v7.app.NotificationCompat;
  import android.widget.Toast;
  
  import java.io.IOException;