Merge branch 'develop' into release-1.5.3
[pub/Android/ownCloud.git] / oc_framework / res /
drwxr-xr-x   ..
drwxr-xr-x - values