Merge remote-tracking branch 'upstream/develop' into
[pub/Android/ownCloud.git] / src / com / owncloud / android / services / observer /
drwxr-xr-x   ..
-rw-r--r-- 14384 FileObserverService.java
-rw-r--r-- 8256 FolderObserver.java