Merge branch 'pr/311' into pull_request_311_with_develop
[pub/Android/ownCloud.git] / res / values-ja-rJP /
drwxr-xr-x   ..
-rw-r--r-- 21491 strings.xml