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