Merge remote-tracking branch 'origin/bug_folder_size_delay' into bug_folder_size_delay
[pub/Android/ownCloud.git] / tests / res / values /
drwxr-xr-x   ..
-rw-r--r-- 129 strings.xml