Merge branch 'develop' into refactor_remote_operation_to_create_folder
[pub/Android/ownCloud.git] / oc_framework-test-project / res / layout /
drwxr-xr-x   ..
-rw-r--r-- 650 activity_test.xml