Merge branch 'develop' into enforce_folder_refresh_even_though_etag_is_not_updated_in...
[pub/Android/ownCloud.git] / src / com / owncloud / android / media /
drwxr-xr-x   ..
-rw-r--r-- 15673 MediaControlView.java
-rw-r--r-- 26297 MediaService.java
-rw-r--r-- 5873 MediaServiceBinder.java