From 414639973713acf4fc5abc267a33740e308fb7a5 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Fri, 11 May 2012 15:16:58 -0700
Subject: [PATCH] Bug 752514 - Sync key/password are swapped, resulting in
 authentication error. r=rnewman

---
 mobile/android/base/ProfileMigrator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/ProfileMigrator.java b/mobile/android/base/ProfileMigrator.java
index d8574e57d81..2508b10ec59 100644
--- a/mobile/android/base/ProfileMigrator.java
+++ b/mobile/android/base/ProfileMigrator.java
@@ -627,8 +627,8 @@ public class ProfileMigrator {
 
         protected void configureSync() {
             final String userName = mSyncSettingsMap.get("services.sync.account");
-            final String syncKey = mSyncSettingsMap.get("Mozilla Services Password");
-            final String syncPass = mSyncSettingsMap.get("Mozilla Services Encryption Passphrase");
+            final String syncKey = mSyncSettingsMap.get("Mozilla Services Encryption Passphrase");
+            final String syncPass = mSyncSettingsMap.get("Mozilla Services Password");
             final String serverURL = mSyncSettingsMap.get("services.sync.serverURL");
             final String clusterURL = mSyncSettingsMap.get("services.sync.clusterURL");
             final String clientName = mSyncSettingsMap.get("services.sync.client.name");