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