Merge remote-tracking branch 'upstream/develop' into us4_view_text_files
[pub/Android/ownCloud.git] / res / drawable-hdpi / folder_public.png
res/drawable-hdpi/folder_public.png