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