From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 29 Oct 2015 17:38:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/videoBigThumbnails' into beta
X-Git-Tag: beta-20151122~85
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ee25589d707182cdf280cf7730f3c4c94a41d664?ds=inline

Merge remote-tracking branch 'remotes/upstream/videoBigThumbnails' into beta
---

ee25589d707182cdf280cf7730f3c4c94a41d664