Merge branch 'master' into create_folder_button_on_action_bar_for_uploader
[pub/Android/ownCloud.git] / res / drawable-xhdpi / ic_cancel.png
res/drawable-xhdpi/ic_cancel.png