Merge remote-tracking branch 'remotes/upstream/master' into sortAccents
[pub/Android/ownCloud.git] / res / values-ja-rJP /
drwxr-xr-x   ..
-rw-r--r-- 29487 strings.xml