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