Merge remote-tracking branch 'remotes/upstream/switchOfflineFiles' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sat, 21 Nov 2015 08:33:26 +0000 (09:33 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sat, 21 Nov 2015 08:33:26 +0000 (09:33 +0100)
commitb1df33a8066fe756f09aab140775f21163489a5e
tree6ef520d1ab7a282baf3aacfd97036d99c733f0e4
parent02aa04eafc025725c3239a1f1f4adc5054f52ffd
parent1b4db02b4e5fc29f5344fd35f16b88024bb5ec13
Merge remote-tracking branch 'remotes/upstream/switchOfflineFiles' into beta
src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java