<NME> CentralBackupAgent.java
<BEF> package cgeo.geocaching.backup;

import cgeo.geocaching.utils.ApplicationSettings;

import android.app.backup.BackupAgentHelper;
import android.app.backup.SharedPreferencesBackupHelper;

public class CentralBackupAgent extends BackupAgentHelper {

    static final String PREFS_BACKUP_KEY = "prefs";

    @Override
    public void onCreate() {
        SharedPreferencesBackupHelper helper = new SharedPreferencesBackupHelper(this, Settings.preferences);
        addHelper(PREFS_BACKUP_KEY, helper);
    }

}

<MSG> Merge remote-tracking branch 'upstream/master' into master-new
<DFF> @@ -7,11 +7,11 @@ import android.app.backup.SharedPreferencesBackupHelper;
 
 public class CentralBackupAgent extends BackupAgentHelper {
 
-    static final String PREFS_BACKUP_KEY = "prefs";
+    private static final String PREFS_BACKUP_KEY = "prefs";
 
     @Override
     public void onCreate() {
-        SharedPreferencesBackupHelper helper = new SharedPreferencesBackupHelper(this, Settings.preferences);
+        final SharedPreferencesBackupHelper helper = new SharedPreferencesBackupHelper(this, Settings.getPreferencesName());
         addHelper(PREFS_BACKUP_KEY, helper);
     }
 

Merge remote-tracking branch 'upstream/master' into master-new