Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster
[pub/Android/ownCloud.git] / res / values-zh-rCN /
drwxr-xr-x   ..
-rw-r--r-- 24650 strings.xml