Merge branch 'develop' into release-1.5.4
[pub/Android/ownCloud.git] / res / drawable-hdpi / file_doc.png
res/drawable-hdpi/file_doc.png