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