Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop
[pub/Android/ownCloud.git] / res / layout-v14 /
drwxr-xr-x   ..
-rw-r--r-- 2218 generic_explanation.xml