fix after rebase

src/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -35,6 +35,7 @@ import android.content.IntentFilter;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Resources.NotFoundException;
 import android.os.Bundle;
 import android.os.Parcelable;
@@ -456,7 +457,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
     }
 
     private Vector<OCFile> sortFileList(Vector<OCFile> files) {
-        SharedPreferences sharedPreferences = PreferenceManager
+        SharedPreferences sharedPreferences = android.preference.PreferenceManager
                 .getDefaultSharedPreferences(this);
 
         // Read sorting order, default to sort by name ascending