Merge remote-tracking branch 'remotes/upstream/master' into animatedGif
authortobiasKaminsky <tobias@kaminsky.me>
Tue, 27 Oct 2015 20:24:36 +0000 (21:24 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Tue, 27 Oct 2015 20:24:36 +0000 (21:24 +0100)
commita7c041ce0034cc3b7b02f71357463e8ba9b142ee
tree642f989adeb2f4e7f4a1be9c111ea93ba2619d13
parent48f5546da2e9c59000f97e6819b4cef216dcfa15
parent3918ec18a8f7c145c732702c7fc8572f892f4b5b
Merge remote-tracking branch 'remotes/upstream/master' into animatedGif
src/com/owncloud/android/ui/preview/PreviewImageFragment.java