Merge branch 'master' into temporal_icons
[pub/Android/ownCloud.git] / res / drawable / common_error.png
res/drawable/common_error.png