Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads
[pub/Android/ownCloud.git] / src / com / owncloud / android / services / observer /
drwxr-xr-x   ..
-rw-r--r-- 14386 FileObserverService.java
-rw-r--r-- 8258 FolderObserver.java