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