Merge remote-tracking branch 'upstream/video_thumbnail' into video_thumbnail
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 14 Aug 2015 13:39:35 +0000 (15:39 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 14 Aug 2015 13:39:35 +0000 (15:39 +0200)
commitc50aa8bc2ad90bad0e1f97a3a7bab461dc05b0d1
treef13ca28462f67da711d8f4dc3403386814d62f1f
parent921e38f13d40ce9bc288c3ad9453e16e4ba1d411
parenta1b24dea37013fec794ecee6a6ef2f3fedefc0a3
Merge remote-tracking branch 'upstream/video_thumbnail' into video_thumbnail
owncloud-android-library
res/drawable-hdpi/view_play.png
res/drawable-mdpi/view_play.png
res/drawable-xhdpi/view_play.png
res/drawable-xxhdpi/view_play.png
res/drawable-xxxhdpi/view_play.png
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java