Merge remote-tracking branch 'origin/master' into cancel_in_upload
[pub/Android/ownCloud.git] / res / values-ja-rJP /
drwxr-xr-x   ..
-rw-r--r-- 15154 strings.xml