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