Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
[pub/Android/ownCloud.git] / res / drawable / uploading_file_indicator.png
res/drawable/uploading_file_indicator.png