Merge remote-tracking branch 'upstream/develop' into
[pub/Android/ownCloud.git] / src / com / owncloud / android / media /
drwxr-xr-x   ..
-rw-r--r-- 15673 MediaControlView.java
-rw-r--r-- 26308 MediaService.java
-rw-r--r-- 5884 MediaServiceBinder.java