Merge branch 'master' into vanish_notifications
[pub/Android/ownCloud.git] / res / values-te /
drwxr-xr-x   ..
-rw-r--r-- 969 strings.xml