fix merge errors
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:54:25 +0000 (17:54 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:54:25 +0000 (17:54 +0100)
commite8f4a3f0e941bc9da5dd17314a4a4fa03d4ca14e
tree69b2d66912b3f92c83e4bbbf2f7c34eee7be80e4
parent420051123c0d61b987f9427c2531b544dd2f68c0
fix merge errors
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java