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