Merge branch 'develop' into fix_upload_fails_sending_another_app
[pub/Android/ownCloud.git] / res / values-ja-rJP /
drwxr-xr-x   ..
-rw-r--r-- 28045 strings.xml