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