Merge remote-tracking branch 'origin/bug_folder_size_delay' into bug_folder_size_delay

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Simple merge

diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index b9d386f,0634965..c674442
--- 1/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
--- 2/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@@ -109,16 -103,7 +109,16 @@@ public class OCFileListFragment extend
          mHandler = new Handler();
  
      }
-     
 +    
 +    /**
 +     * Saves the current listed folder.
 +     */
 +    @Override
 +    public void onSaveInstanceState (Bundle outState) {
 +        super.onSaveInstanceState(outState);
 +        outState.putParcelable(EXTRA_FILE, mFile);
 +    }
+ 
  
      /**
       * Call this, when the user presses the up button