Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta

diff --cc src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index c45f76c,f05391a..dc96b9f
--- 1/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
--- 2/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@@ -140,9 -141,10 +142,10 @@@ public class PreviewImageFragment exten
              // not right now
  
          mIgnoreFirstSavedState = args.getBoolean(ARG_IGNORE_FIRST);
+         mShowResizedImage = args.getBoolean(ARG_SHOW_RESIZED_IMAGE);
          setHasOptionsMenu(true);
      }
 -    
 +
  
      /**
       * {@inheritDoc}