Merge branch 'develop' into thumbnailForUpload
authorjabarros <jabarros@solidgear.es>
Fri, 19 Dec 2014 09:58:08 +0000 (10:58 +0100)
committerjabarros <jabarros@solidgear.es>
Fri, 19 Dec 2014 09:58:08 +0000 (10:58 +0100)
commit6e3d3cd016c235462d9f623622dfaaefb77fec95
tree88de1b8f14f0ad8a1366e3c508854039aa662817
parenta71079726299d3ef519de5a6963010122b4caf5b
parent78c1a484e784dd637ab24000374dea83b5088bc7
Merge branch 'develop' into thumbnailForUpload
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java