Merge branch 'master' into sync_full_folder
[pub/Android/ownCloud.git] / res / values-km /
drwxr-xr-x   ..
-rw-r--r-- 8904 strings.xml