Merge branch 'develop' of github.com:owncloud/android into svgTransparentBackground
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 21 Aug 2015 15:48:58 +0000 (17:48 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 21 Aug 2015 15:48:58 +0000 (17:48 +0200)
commit8e3787909f253c66a91c137d25cb2b430cfe9dc3
tree5a8f4d817af63f6dc141c2443dda8c0ec891ce56
parent9ea3f7794fe9c125421d9115327ce52bc89e8b52
parent0c7a9c3e3a0bba9344db08c8c2acf2718b968e92
Merge branch 'develop' of github.com:owncloud/android into svgTransparentBackground
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java