Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict_save_local_version
[pub/Android/ownCloud.git] / res / drawable-mdpi / file_application.png
res/drawable-mdpi/file_application.png