Merge branch 'develop' into fix_upload_fails_sending_another_app
[pub/Android/ownCloud.git] / src / com / owncloud / android / media /
drwxr-xr-x   ..
-rw-r--r-- 15670 MediaControlView.java
-rw-r--r-- 26310 MediaService.java
-rw-r--r-- 5884 MediaServiceBinder.java