Merge branch 'master' into create_folder_button_on_action_bar_for_uploader
[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