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