From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 12 May 2015 11:32:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/thumbnailOOM' into thumbnailOOM
X-Git-Tag: test~6^2^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/25f5eb193e1f6bc7cceaf95676dbc59a9c6d7ffb

Merge remote-tracking branch 'origin/thumbnailOOM' into thumbnailOOM
---

25f5eb193e1f6bc7cceaf95676dbc59a9c6d7ffb