From ae326d8e37372504174a85d7b5a5605c187457f3 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Thu, 5 Jun 2014 15:49:31 -0700
Subject: [PATCH 001/103] Bug 1014283 - Finish BrowserHealthRecorder
 initialization after distribution processing. r=margaret

---
 mobile/android/base/health/BrowserHealthRecorder.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mobile/android/base/health/BrowserHealthRecorder.java b/mobile/android/base/health/BrowserHealthRecorder.java
index c2e9a081897..f4b9753fa73 100644
--- a/mobile/android/base/health/BrowserHealthRecorder.java
+++ b/mobile/android/base/health/BrowserHealthRecorder.java
@@ -525,16 +525,17 @@ public class BrowserHealthRecorder implements HealthRecorder, GeckoEventListener
 
         // Because the distribution lookup can take some time, do it at the end of
         // our background startup work, along with the Gecko snapshot fetch.
-        final GeckoEventListener self = this;
-        ThreadUtils.postToBackgroundThread(new Runnable() {
+        final Distribution distribution = Distribution.getInstance(context);
+        distribution.addOnDistributionReadyCallback(new Runnable() {
             @Override
             public void run() {
-                final DistributionDescriptor desc = new Distribution(context).getDescriptor();
+                Log.d(LOG_TAG, "Running post-distribution task: health recorder.");
+                final DistributionDescriptor desc = distribution.getDescriptor();
                 if (desc != null && desc.valid) {
                     profileCache.setDistributionString(desc.id, desc.version);
                 }
                 Log.d(LOG_TAG, "Requesting all add-ons and FHR prefs from Gecko.");
-                dispatcher.registerGeckoThreadListener(self, EVENT_SNAPSHOT);
+                dispatcher.registerGeckoThreadListener(BrowserHealthRecorder.this, EVENT_SNAPSHOT);
                 GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("HealthReport:RequestSnapshot", null));
             }
         });

From 53542c3bbeb14835d408289074664c886c9bf9b3 Mon Sep 17 00:00:00 2001
From: Erik Vold <evold@mozilla.com>
Date: Thu, 5 Jun 2014 16:22:03 -0700
Subject: [PATCH 002/103] Bug 1021280 - Uplift Add-on SDK to Firefox r=me

---
 .../source/examples/toolbar-api/package.json  |  9 ++-
 addon-sdk/source/lib/sdk/addon/runner.js      | 15 ++--
 addon-sdk/source/lib/sdk/content/content.js   | 29 +++++---
 addon-sdk/source/lib/sdk/request.js           | 14 +++-
 addon-sdk/source/lib/sdk/self.js              | 25 +++++--
 addon-sdk/source/lib/sdk/tabs/utils.js        | 58 +--------------
 addon-sdk/source/lib/toolkit/loader.js        | 10 +--
 .../source/python-lib/cuddlefish/__init__.py  |  1 -
 .../python-lib/cuddlefish/tests/test_xpi.py   |  6 +-
 .../test/addons/content-permissions/main.js   |  2 +-
 .../test/addons/l10n-properties/main.js       |  2 +-
 addon-sdk/source/test/addons/l10n/main.js     |  2 +-
 .../source/test/addons/layout-change/main.js  |  2 +-
 addon-sdk/source/test/addons/packed/main.js   |  2 +-
 addon-sdk/source/test/addons/require/main.js  |  2 +-
 .../test/addons/simple-prefs/lib/main.js      |  2 +-
 addon-sdk/source/test/addons/unpacked/main.js |  2 +-
 addon-sdk/source/test/test-child_process.js   |  3 +
 .../source/test/test-content-symbiont.js      | 25 +++++++
 addon-sdk/source/test/test-request.js         | 71 +++++++++++++++++++
 20 files changed, 183 insertions(+), 99 deletions(-)

diff --git a/addon-sdk/source/examples/toolbar-api/package.json b/addon-sdk/source/examples/toolbar-api/package.json
index a883c1e4cba..dbceabb99f1 100644
--- a/addon-sdk/source/examples/toolbar-api/package.json
+++ b/addon-sdk/source/examples/toolbar-api/package.json
@@ -1,9 +1,12 @@
 {
   "name": "toolbar-api",
-  "title": "toolbar-api",
-  "id": "toolbar-api",
+  "title": "Toolbar API",
+  "main": "./lib/main.js",
   "description": "a toolbar api example",
   "author": "",
   "license": "MPL 2.0",
-  "version": "0.1"
+  "version": "0.1",
+  "engines": {
+    "firefox": ">=27.0 <=30.0"
+  }
 }
diff --git a/addon-sdk/source/lib/sdk/addon/runner.js b/addon-sdk/source/lib/sdk/addon/runner.js
index 0cbde2bea5f..8ef3b3c8b61 100644
--- a/addon-sdk/source/lib/sdk/addon/runner.js
+++ b/addon-sdk/source/lib/sdk/addon/runner.js
@@ -12,11 +12,12 @@ const { once } = require('../system/events');
 const { exit, env, staticArgs } = require('../system');
 const { when: unload } = require('../system/unload');
 const { loadReason } = require('../self');
-const { rootURI, metadata: { preferences } } = require("@loader/options");
+const { rootURI, metadata } = require("@loader/options");
 const globals = require('../system/globals');
 const xulApp = require('../system/xul-app');
 const appShellService = Cc['@mozilla.org/appshell/appShellService;1'].
                         getService(Ci.nsIAppShellService);
+const { preferences } = metadata;
 
 const NAME2TOPIC = {
   'Firefox': 'sessionstore-windows-restored',
@@ -134,13 +135,13 @@ function run(options) {
     if (preferences && preferences.length > 0) {
       try {
         require('../preferences/native-options').enable(preferences);
-      } 
-      catch (error) {
-        console.exception(error); 
       }
-    } 
+      catch (error) {
+        console.exception(error);
+      }
+    }
     else {
-      // keeping support for addons packaged with older SDK versions, 
+      // keeping support for addons packaged with older SDK versions,
       // when cfx didn't include the 'preferences' key in @loader/options
 
       // Initialize inline options localization, without preventing addon to be
@@ -158,7 +159,7 @@ function run(options) {
         // Only set if `prefsURI` specified
         try {
           setDefaultPrefs(options.prefsURI);
-        } 
+        }
         catch (err) {
           // cfx bootstrap always passes prefsURI, even in addons without prefs
         }
diff --git a/addon-sdk/source/lib/sdk/content/content.js b/addon-sdk/source/lib/sdk/content/content.js
index 9de0f463d22..5bd98145c8c 100644
--- a/addon-sdk/source/lib/sdk/content/content.js
+++ b/addon-sdk/source/lib/sdk/content/content.js
@@ -7,13 +7,26 @@ module.metadata = {
   "stability": "deprecated"
 };
 
-const { deprecateFunction } = require('../util/deprecate');
+const { deprecateUsage } = require('../util/deprecate');
 
-exports.Loader = deprecateFunction(require('./loader').Loader,
-  '`sdk/content/content` is deprecated. Please use `sdk/content/loader` directly.');
-exports.Symbiont = deprecateFunction(require('../deprecated/symbiont').Symbiont,
-  'Both `sdk/content/content` and `sdk/deprecated/symbiont` are deprecated. ' +
-  '`sdk/core/heritage` supersedes Symbiont for inheritance.');
-exports.Worker = deprecateFunction(require('./worker').Worker,
-  '`sdk/content/content` is deprecated. Please use `sdk/content/worker` directly.');
+Object.defineProperty(exports, "Loader", { 
+  get: function() {
+    deprecateUsage('`sdk/content/content` is deprecated. Please use `sdk/content/loader` directly.');
+    return require('./loader').Loader;
+  }
+});
 
+Object.defineProperty(exports, "Symbiont", { 
+  get: function() {
+    deprecateUsage('Both `sdk/content/content` and `sdk/deprecated/symbiont` are deprecated. ' +
+                   '`sdk/core/heritage` supersedes Symbiont for inheritance.');
+    return require('../deprecated/symbiont').Symbiont;
+  }
+});
+
+Object.defineProperty(exports, "Worker", { 
+  get: function() {
+    deprecateUsage('`sdk/content/content` is deprecated. Please use `sdk/content/worker` directly.');
+    return require('./worker').Worker;
+  }
+});
diff --git a/addon-sdk/source/lib/sdk/request.js b/addon-sdk/source/lib/sdk/request.js
index ccf9bfb0342..7c358ffd43c 100644
--- a/addon-sdk/source/lib/sdk/request.js
+++ b/addon-sdk/source/lib/sdk/request.js
@@ -44,6 +44,10 @@ const { validateOptions, validateSingleOption } = new OptionsValidator({
   overrideMimeType: {
     map: function(v) v || null,
     is: ["string", "null"],
+  },
+  anonymous: {
+    map: function(v) v || false,
+    is: ["boolean", "null"],
   }
 });
 
@@ -54,7 +58,7 @@ const REUSE_ERROR = "This request object has been used already. You must " +
 // request types
 function runRequest(mode, target) {
   let source = request(target)
-  let { xhr, url, content, contentType, headers, overrideMimeType } = source;
+  let { xhr, url, content, contentType, headers, overrideMimeType, anonymous } = source;
 
   let isGetOrHead = (mode == "GET" || mode == "HEAD");
 
@@ -63,7 +67,9 @@ function runRequest(mode, target) {
   if (xhr)
     throw new Error(REUSE_ERROR);
 
-  xhr = source.xhr = new XMLHttpRequest();
+  xhr = source.xhr = new XMLHttpRequest({
+    mozAnon: anonymous
+  });
 
   // Build the data to be set. For GET or HEAD requests, we want to append that
   // to the URL before opening the request.
@@ -129,6 +135,7 @@ const Request = Class({
   set contentType(value) {
     request(this).contentType = validateSingleOption('contentType', value);
   },
+  get anonymous() { return request(this).anonymous; },
   get response() { return request(this).response; },
   delete: function() {
     runRequest('DELETE', this);
@@ -202,7 +209,8 @@ const Response = Class({
       }
     });
     return headers;
-  }
+  },
+  get anonymous() response(this).request.mozAnon
 });
 
 // apiUtils.validateOptions doesn't give the ability to easily validate single
diff --git a/addon-sdk/source/lib/sdk/self.js b/addon-sdk/source/lib/sdk/self.js
index c720be890b7..af093819b3b 100644
--- a/addon-sdk/source/lib/sdk/self.js
+++ b/addon-sdk/source/lib/sdk/self.js
@@ -8,12 +8,24 @@ module.metadata = {
 };
 
 const { CC } = require('chrome');
-const { id, name, prefixURI, rootURI, metadata,
-        version, loadReason, preferencesBranch } = require('@loader/options');
+const options = require('@loader/options');
 
+const { get } = require("./preferences/service");
 const { readURISync } = require('./net/url');
 
-const addonDataURI = prefixURI + name + '/data/';
+const id = options.id;
+
+const readPref = key => get("extensions." + id + ".sdk." + key);
+
+const name = readPref("name") || options.name;
+const version = readPref("version") || options.version;
+const loadReason = readPref("load.reason") || options.loadReason;
+const rootURI = readPref("rootURI") || options.rootURI || "";
+const baseURI = readPref("baseURI") || options.prefixURI + name + "/";
+const addonDataURI = baseURI + "data/";
+const metadata = options.metadata || {};
+const permissions = metadata.permissions || {};
+const isPacked = rootURI && rootURI.indexOf("jar:") === 0;
 
 const uri = (path="") =>
   path.contains(":") ? path : addonDataURI + path;
@@ -24,16 +36,15 @@ const uri = (path="") =>
 // associated unique URI string that can be used for that.
 exports.uri = 'addon:' + id;
 exports.id = id;
-exports.preferencesBranch = preferencesBranch || id;
+exports.preferencesBranch = options.preferencesBranch || id;
 exports.name = name;
 exports.loadReason = loadReason;
 exports.version = version;
-// If `rootURI` is jar:file://...!/ than add-on is packed.
-exports.packed = (rootURI || '').indexOf('jar:') === 0;
+exports.packed = isPacked;
 exports.data = Object.freeze({
   url: uri,
   load: function read(path) {
     return readURISync(uri(path));
   }
 });
-exports.isPrivateBrowsingSupported = ((metadata || {}).permissions || {})['private-browsing'] === true;
+exports.isPrivateBrowsingSupported = permissions['private-browsing'] === true;
diff --git a/addon-sdk/source/lib/sdk/tabs/utils.js b/addon-sdk/source/lib/sdk/tabs/utils.js
index b99533d0f9c..6909cce006d 100644
--- a/addon-sdk/source/lib/sdk/tabs/utils.js
+++ b/addon-sdk/source/lib/sdk/tabs/utils.js
@@ -61,7 +61,8 @@ function activateTab(tab, window) {
 exports.activateTab = activateTab;
 
 function getTabBrowser(window) {
-  return window.gBrowser;
+  // bug 1009938 - may be null in SeaMonkey
+  return window.gBrowser || window.getBrowser();
 }
 exports.getTabBrowser = getTabBrowser;
 
@@ -240,63 +241,10 @@ exports.getAllTabContentWindows = getAllTabContentWindows;
 
 // gets the tab containing the provided window
 function getTabForContentWindow(window) {
-  // Retrieve the topmost frame container. It can be either <xul:browser>,
-  // <xul:iframe/> or <html:iframe/>. But in our case, it should be xul:browser.
-  let browser;
-  try {
-    browser = window.QueryInterface(Ci.nsIInterfaceRequestor)
-                    .getInterface(Ci.nsIWebNavigation)
-                    .QueryInterface(Ci.nsIDocShell)
-                    .chromeEventHandler;
-  } catch(e) {
-    // Bug 699450: The tab may already have been detached so that `window` is
-    // in a almost destroyed state and can't be queryinterfaced anymore.
-  }
-
-  // Is null for toplevel documents
-  if (!browser) {
-    return null;
-  }
-
-  // Retrieve the owner window, should be browser.xul one
-  let chromeWindow = browser.ownerDocument.defaultView;
-
-  // Ensure that it is top-level browser window.
-  // We need extra checks because of Mac hidden window that has a broken
-  // `gBrowser` global attribute.
-  if ('gBrowser' in chromeWindow && chromeWindow.gBrowser &&
-      'browsers' in chromeWindow.gBrowser) {
-    // Looks like we are on Firefox Desktop
-    // Then search for the position in tabbrowser in order to get the tab object
-    let browsers = chromeWindow.gBrowser.browsers;
-    let i = browsers.indexOf(browser);
-    if (i !== -1)
-      return chromeWindow.gBrowser.tabs[i];
-    return null;
-  }
-  // Fennec
-  else if ('BrowserApp' in chromeWindow) {
-    return getTabForWindow(window);
-  }
-
-  return null;
+  return getTabs().find(tab => getTabContentWindow(tab) === window.top) || null;
 }
 exports.getTabForContentWindow = getTabForContentWindow;
 
-// used on fennec
-function getTabForWindow(window) {
-  for each (let { BrowserApp } in getWindows()) {
-    if (!BrowserApp)
-      continue;
-
-    for each (let tab in BrowserApp.tabs) {
-      if (tab.browser.contentWindow == window.top)
-        return tab;
-    }
-  }
-  return null;
-}
-
 function getTabURL(tab) {
   if (tab.browser) // fennec
     return String(tab.browser.currentURI.spec);
diff --git a/addon-sdk/source/lib/toolkit/loader.js b/addon-sdk/source/lib/toolkit/loader.js
index 6a419e4e42b..c73c1ad5bde 100644
--- a/addon-sdk/source/lib/toolkit/loader.js
+++ b/addon-sdk/source/lib/toolkit/loader.js
@@ -384,13 +384,12 @@ exports.resolve = resolve;
 // algorithm.
 // `id` should already be resolved relatively at this point.
 // http://nodejs.org/api/modules.html#modules_all_together
-const nodeResolve = iced(function nodeResolve(id, requirer, { manifest, rootURI }) {
+const nodeResolve = iced(function nodeResolve(id, requirer, { rootURI }) {
   // Resolve again
   id = exports.resolve(id, requirer);
 
   // we assume that extensions are correct, i.e., a directory doesnt't have '.js'
   // and a js file isn't named 'file.json.js'
-
   let fullId = join(rootURI, id);
 
   let resolvedPath;
@@ -400,7 +399,7 @@ const nodeResolve = iced(function nodeResolve(id, requirer, { manifest, rootURI
     return stripBase(rootURI, resolvedPath);
   // If manifest has dependencies, attempt to look up node modules
   // in the `dependencies` list
-  else if (manifest.dependencies) {
+  else {
     let dirs = getNodeModulePaths(dirname(join(rootURI, requirer))).map(dir => join(dir, id));
     for (let i = 0; i < dirs.length; i++) {
       if (resolvedPath = loadAsFile(dirs[i]))
@@ -533,7 +532,6 @@ const Require = iced(function Require(loader, requirer) {
 
     // TODO should get native Firefox modules before doing node-style lookups
     // to save on loading time
-
     if (isNative) {
       // If a requireMap is available from `generateMap`, use that to
       // immediately resolve the node-style mapping.
@@ -693,7 +691,8 @@ const Loader = iced(function Loader(options) {
   });
 
   let {
-    modules, globals, resolve, paths, rootURI, manifest, requireMap, isNative
+    modules, globals, resolve, paths, rootURI,
+    manifest, requireMap, isNative, metadata
   } = override({
     paths: {},
     modules: {},
@@ -748,6 +747,7 @@ const Loader = iced(function Loader(options) {
     mapping: { enumerable: false, value: mapping },
     // Map of module objects indexed by module URIs.
     modules: { enumerable: false, value: modules },
+    metadata: { enumerable: false, value: metadata },
     // Map of module sandboxes indexed by module URIs.
     sandboxes: { enumerable: false, value: {} },
     resolve: { enumerable: false, value: resolve },
diff --git a/addon-sdk/source/python-lib/cuddlefish/__init__.py b/addon-sdk/source/python-lib/cuddlefish/__init__.py
index 69dfddb823d..17e2cd58ff3 100644
--- a/addon-sdk/source/python-lib/cuddlefish/__init__.py
+++ b/addon-sdk/source/python-lib/cuddlefish/__init__.py
@@ -5,7 +5,6 @@
 import sys
 import os
 import optparse
-import webbrowser
 import time
 
 from copy import copy
diff --git a/addon-sdk/source/python-lib/cuddlefish/tests/test_xpi.py b/addon-sdk/source/python-lib/cuddlefish/tests/test_xpi.py
index 7d0f2674bce..0b822a55f0c 100644
--- a/addon-sdk/source/python-lib/cuddlefish/tests/test_xpi.py
+++ b/addon-sdk/source/python-lib/cuddlefish/tests/test_xpi.py
@@ -148,12 +148,12 @@ class SmallXPI(unittest.TestCase):
             os.path.join("sdk", "core", "promise.js"),
             os.path.join("sdk", "net", "url.js"),
             os.path.join("sdk", "util", "object.js"),
-            os.path.join("sdk", "util", "array.js")
+            os.path.join("sdk", "util", "array.js"),
+            os.path.join("sdk", "preferences", "service.js")
             ]])
 
         missing = set(expected) - set(used_files)
         extra = set(used_files) - set(expected)
-
         self.failUnlessEqual(list(missing), [])
         self.failUnlessEqual(list(extra), [])
         used_deps = m.get_used_packages()
@@ -190,6 +190,8 @@ class SmallXPI(unittest.TestCase):
                     "resources/addon-sdk/lib/sdk/util/object.js",
                     "resources/addon-sdk/lib/sdk/util/array.js",
                     "resources/addon-sdk/lib/sdk/net/url.js",
+                    "resources/addon-sdk/lib/sdk/preferences/",
+                    "resources/addon-sdk/lib/sdk/preferences/service.js",
                     "resources/three/",
                     "resources/three/lib/",
                     "resources/three/lib/main.js",
diff --git a/addon-sdk/source/test/addons/content-permissions/main.js b/addon-sdk/source/test/addons/content-permissions/main.js
index 79f81db21a2..cae65db4a1a 100644
--- a/addon-sdk/source/test/addons/content-permissions/main.js
+++ b/addon-sdk/source/test/addons/content-permissions/main.js
@@ -1,4 +1,4 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
diff --git a/addon-sdk/source/test/addons/l10n-properties/main.js b/addon-sdk/source/test/addons/l10n-properties/main.js
index 430b1b03d7d..e65b7dc9e8e 100644
--- a/addon-sdk/source/test/addons/l10n-properties/main.js
+++ b/addon-sdk/source/test/addons/l10n-properties/main.js
@@ -1,4 +1,4 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
diff --git a/addon-sdk/source/test/addons/l10n/main.js b/addon-sdk/source/test/addons/l10n/main.js
index 22226203960..5bc1b39764e 100644
--- a/addon-sdk/source/test/addons/l10n/main.js
+++ b/addon-sdk/source/test/addons/l10n/main.js
@@ -1,4 +1,4 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
diff --git a/addon-sdk/source/test/addons/layout-change/main.js b/addon-sdk/source/test/addons/layout-change/main.js
index 24036a2a3ab..bce41020cfe 100644
--- a/addon-sdk/source/test/addons/layout-change/main.js
+++ b/addon-sdk/source/test/addons/layout-change/main.js
@@ -1,4 +1,4 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
diff --git a/addon-sdk/source/test/addons/packed/main.js b/addon-sdk/source/test/addons/packed/main.js
index 3a7a813a720..9be0cc4b0b1 100644
--- a/addon-sdk/source/test/addons/packed/main.js
+++ b/addon-sdk/source/test/addons/packed/main.js
@@ -1,4 +1,4 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
diff --git a/addon-sdk/source/test/addons/require/main.js b/addon-sdk/source/test/addons/require/main.js
index 03972abd247..7d30f2bb390 100644
--- a/addon-sdk/source/test/addons/require/main.js
+++ b/addon-sdk/source/test/addons/require/main.js
@@ -1,4 +1,4 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
diff --git a/addon-sdk/source/test/addons/simple-prefs/lib/main.js b/addon-sdk/source/test/addons/simple-prefs/lib/main.js
index 5252ee732a9..46647025420 100644
--- a/addon-sdk/source/test/addons/simple-prefs/lib/main.js
+++ b/addon-sdk/source/test/addons/simple-prefs/lib/main.js
@@ -134,7 +134,7 @@ if (app.is('Firefox')) {
       });
   }
 
-  // run it again, to test against inline options document caching 
+  // run it again, to test against inline options document caching
   // and duplication of <setting> nodes upon re-entry to about:addons
   exports.testAgainstDocCaching = exports.testAOM;
 
diff --git a/addon-sdk/source/test/addons/unpacked/main.js b/addon-sdk/source/test/addons/unpacked/main.js
index a9caf7078af..903b94c5492 100644
--- a/addon-sdk/source/test/addons/unpacked/main.js
+++ b/addon-sdk/source/test/addons/unpacked/main.js
@@ -1,4 +1,4 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
diff --git a/addon-sdk/source/test/test-child_process.js b/addon-sdk/source/test/test-child_process.js
index 55f2fc1be80..c132cdf3cfa 100644
--- a/addon-sdk/source/test/test-child_process.js
+++ b/addon-sdk/source/test/test-child_process.js
@@ -540,3 +540,6 @@ exports.testFork = function (assert) {
 after(exports, cleanUp);
 
 require("test").run(exports);
+
+// Test disabled because of bug 979675
+module.exports = {};
diff --git a/addon-sdk/source/test/test-content-symbiont.js b/addon-sdk/source/test/test-content-symbiont.js
index b0eb9978531..2716d1e0836 100644
--- a/addon-sdk/source/test/test-content-symbiont.js
+++ b/addon-sdk/source/test/test-content-symbiont.js
@@ -9,6 +9,10 @@ const self = require('sdk/self');
 const fixtures = require("./fixtures");
 const { close } = require('sdk/window/helpers');
 const app = require("sdk/system/xul-app");
+const { LoaderWithHookedConsole } = require('sdk/test/loader');
+const { set: setPref, get: getPref } = require("sdk/preferences/service");
+
+const DEPRECATE_PREF = "devtools.errorconsole.deprecation_warnings";
 
 function makeWindow() {
   let content =
@@ -157,4 +161,25 @@ exports["test:document element present on 'start'"] = function(assert, done) {
   });
 };
 
+exports["test:content/content deprecation"] = function(assert) {
+  let pref = getPref(DEPRECATE_PREF, false);
+  setPref(DEPRECATE_PREF, true);
+
+  const { loader, messages } = LoaderWithHookedConsole(module);
+  const { Loader, Symbiont, Worker } = loader.require("sdk/content/content");
+
+  assert.equal(messages.length, 3, "Should see three warnings");
+
+  assert.strictEqual(Loader, loader.require('sdk/content/loader').Loader,
+    "Loader from content/content is the exact same object as the one from content/loader");
+
+  assert.strictEqual(Symbiont, loader.require('sdk/deprecated/symbiont').Symbiont,
+    "Symbiont from content/content is the exact same object as the one from deprecated/symbiont");
+
+  assert.strictEqual(Worker, loader.require('sdk/content/worker').Worker,
+    "Worker from content/content is the exact same object as the one from content/worker");
+
+  setPref(DEPRECATE_PREF, pref);
+}
+
 require("test").run(exports);
diff --git a/addon-sdk/source/test/test-request.js b/addon-sdk/source/test/test-request.js
index a18d86d9919..41892fbb413 100644
--- a/addon-sdk/source/test/test-request.js
+++ b/addon-sdk/source/test/test-request.js
@@ -43,6 +43,23 @@ exports.testOptionsValidator = function(assert) {
   }, /The option "url" is invalid/);
   // The url shouldn't have changed, so check that
   assert.equal(req.url, "http://playground.zpao.com/jetpack/request/text.php");
+
+  // Test default anonymous parameter value
+  assert.equal(req.anonymous, false);
+  // Test set anonymous parameter value
+  req = Request({
+    url: "http://playground.zpao.com/jetpack/request/text.php",
+    anonymous: true,
+    onComplete: function () {}
+  });
+  assert.equal(req.anonymous, true);
+  // Test wrong value as anonymous parameter value
+  assert.throws(function() {
+    Request({
+      url: "http://playground.zpao.com/jetpack/request/text.php",
+      anonymous: "invalidvalue"
+    });
+  }, /The option "anonymous" must be one of the following types/);
 };
 
 exports.testContentValidator = function(assert, done) {
@@ -183,6 +200,60 @@ exports.test3rdPartyCookies = function (assert, done) {
   }).get();
 };
 
+// Test anonymous request behavior
+exports.testAnonymousRequest = function(assert, done) {
+  let srv = startServerAsync(port, basePath);
+  let basename = "test-anonymous-request.sjs";
+  let testUrl = "http://localhost:" + port + "/" + basename;
+  // Function to handle the requests in the server
+  let content = function handleRequest(request, response) {
+    // Request to store cookie
+    response.setHeader("Set-Cookie", "anonymousKey=anonymousValue;", "true");
+    // Set response content type
+    response.setHeader("Content-Type", "application/json");
+    // Check if cookie was send during request
+    var cookiePresent = request.hasHeader("Cookie");
+    // Create server respone content
+    response.write(JSON.stringify({ "hasCookie": cookiePresent }));
+  }.toString();
+  prepareFile(basename, content);
+  // Create request callbacks
+  var checkCookieCreated = function (response) {
+    // Check that the server created the cookie
+    assert.equal(response.headers['Set-Cookie'], 'anonymousKey=anonymousValue;');
+    // Make an other request and check that the server this time got the cookie
+    Request({
+      url: testUrl,
+      onComplete: checkCookieSend
+    }).get();
+  },
+  checkCookieSend = function (response) {
+    // Check the response sent headers and cookies
+    assert.equal(response.anonymous, false);
+    // Check the server got the created cookie
+    assert.equal(response.json.hasCookie, true);
+    // Make a anonymous request and check the server did not get the cookie
+    Request({
+      url: testUrl,
+      anonymous: true,
+      onComplete: checkCookieNotSend
+    }).get();
+  },
+  checkCookieNotSend = function (response) {
+    // Check the response is anonymous
+    assert.equal(response.anonymous, true);
+    // Check the server did not get the cookie
+    assert.equal(response.json.hasCookie, false);
+    // Stop the server
+    srv.stop(done);
+  };
+  // Make the first request to create cookie
+  Request({
+    url: testUrl,
+    onComplete: checkCookieCreated
+  }).get();
+};
+
 exports.testSimpleJSON = function (assert, done) {
   let srv = startServerAsync(port, basePath);
   let json = { foo: "bar" };

From 67bcef909d4fe38e2f501b7e21fcb6937c5c4407 Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Thu, 5 Jun 2014 18:10:17 -0700
Subject: [PATCH 003/103] Bug 1010999 - Change update notification to Weekly
 instead of Daily on Aurora. r=gavin.sharp

---
 browser/branding/aurora/pref/firefox-branding.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/branding/aurora/pref/firefox-branding.js b/browser/branding/aurora/pref/firefox-branding.js
index 26aa01729b7..d847ce7be24 100644
--- a/browser/branding/aurora/pref/firefox-branding.js
+++ b/browser/branding/aurora/pref/firefox-branding.js
@@ -12,8 +12,8 @@ pref("app.update.interval", 28800); // 8 hours
 // The time interval between the downloading of mar file chunks in the
 // background (in seconds)
 pref("app.update.download.backgroundInterval", 60);
-// Give the user x seconds to react before showing the big UI. default=24 hours
-pref("app.update.promptWaitTime", 86400);
+// Give the user x seconds to react before showing the big UI. default=168 hours
+pref("app.update.promptWaitTime", 604800);
 // URL user can browse to manually if for some reason all update installation
 // attempts fail.
 pref("app.update.url.manual", "https://www.mozilla.org/firefox/aurora/");

From aeb48f97310169a4e6d65d1d5e523bdfcf9394f2 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Thu, 5 Jun 2014 19:38:01 -0700
Subject: [PATCH 004/103] Bug 1021443 - java.lang.IllegalStateException:
 Already registered Webapps:Postinstall under a different type. r=jchen

---
 mobile/android/base/webapp/EventListener.java | 46 ++++++++-----------
 mobile/android/base/webapp/InstallHelper.java | 10 ++--
 mobile/android/base/webapp/WebappImpl.java    |  5 +-
 3 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/mobile/android/base/webapp/EventListener.java b/mobile/android/base/webapp/EventListener.java
index 07537f21c0d..2312d1bd3a7 100644
--- a/mobile/android/base/webapp/EventListener.java
+++ b/mobile/android/base/webapp/EventListener.java
@@ -5,33 +5,6 @@
 
 package org.mozilla.gecko.webapp;
 
-import org.mozilla.gecko.ActivityHandlerHelper;
-import org.mozilla.gecko.AppConstants;
-import org.mozilla.gecko.GeckoAppShell;
-import org.mozilla.gecko.GeckoEvent;
-import org.mozilla.gecko.GeckoProfile;
-import org.mozilla.gecko.favicons.decoders.FaviconDecoder;
-import org.mozilla.gecko.gfx.BitmapUtils;
-import org.mozilla.gecko.util.ActivityResultHandler;
-import org.mozilla.gecko.EventDispatcher;
-import org.mozilla.gecko.util.EventCallback;
-import org.mozilla.gecko.util.NativeEventListener;
-import org.mozilla.gecko.util.NativeJSObject;
-import org.mozilla.gecko.util.ThreadUtils;
-import org.mozilla.gecko.WebappAllocator;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.util.Log;
-
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -40,6 +13,25 @@ import java.util.Set;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.mozilla.gecko.ActivityHandlerHelper;
+import org.mozilla.gecko.EventDispatcher;
+import org.mozilla.gecko.GeckoAppShell;
+import org.mozilla.gecko.GeckoProfile;
+import org.mozilla.gecko.util.ActivityResultHandler;
+import org.mozilla.gecko.util.EventCallback;
+import org.mozilla.gecko.util.NativeEventListener;
+import org.mozilla.gecko.util.NativeJSObject;
+import org.mozilla.gecko.util.ThreadUtils;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.util.Log;
 
 public class EventListener implements NativeEventListener  {
 
diff --git a/mobile/android/base/webapp/InstallHelper.java b/mobile/android/base/webapp/InstallHelper.java
index eda6d8b0ddd..8f60f5ea2d5 100644
--- a/mobile/android/base/webapp/InstallHelper.java
+++ b/mobile/android/base/webapp/InstallHelper.java
@@ -19,7 +19,9 @@ import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.GeckoProfile;
 import org.mozilla.gecko.gfx.BitmapUtils;
-import org.mozilla.gecko.util.GeckoEventListener;
+import org.mozilla.gecko.util.EventCallback;
+import org.mozilla.gecko.util.NativeEventListener;
+import org.mozilla.gecko.util.NativeJSObject;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import android.content.Context;
@@ -27,7 +29,7 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.util.Log;
 
-public class InstallHelper implements GeckoEventListener {
+public class InstallHelper implements NativeEventListener {
     private static final String LOGTAG = "GeckoWebappInstallHelper";
     private static final String[] INSTALL_EVENT_NAMES = new String[] {"Webapps:Postinstall"};
     private final Context mContext;
@@ -36,7 +38,7 @@ public class InstallHelper implements GeckoEventListener {
 
     public static interface InstallCallback {
         // on the GeckoThread
-        void installCompleted(InstallHelper installHelper, String event, JSONObject message);
+        void installCompleted(InstallHelper installHelper, String event, NativeJSObject message);
 
         // on the GeckoBackgroundThread
         void installErrored(InstallHelper installHelper, Exception exception);
@@ -162,7 +164,7 @@ public class InstallHelper implements GeckoEventListener {
     }
 
     @Override
-    public void handleMessage(String event, JSONObject message) {
+    public void handleMessage(String event, NativeJSObject message, EventCallback callback) {
         EventDispatcher.getInstance().unregisterGeckoThreadListener(this, INSTALL_EVENT_NAMES);
 
         if (mCallback != null) {
diff --git a/mobile/android/base/webapp/WebappImpl.java b/mobile/android/base/webapp/WebappImpl.java
index 5adc670b59f..7dceb19d940 100644
--- a/mobile/android/base/webapp/WebappImpl.java
+++ b/mobile/android/base/webapp/WebappImpl.java
@@ -18,6 +18,7 @@ import org.mozilla.gecko.GeckoThread;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
+import org.mozilla.gecko.util.NativeJSObject;
 import org.mozilla.gecko.webapp.InstallHelper.InstallCallback;
 
 import android.content.Intent;
@@ -325,13 +326,13 @@ public class WebappImpl extends GeckoApp implements InstallCallback {
     }
 
     @Override
-    public void installCompleted(InstallHelper installHelper, String event, JSONObject message) {
+    public void installCompleted(InstallHelper installHelper, String event, NativeJSObject message) {
         if (event == null) {
             return;
         }
 
         if (event.equals("Webapps:Postinstall")) {
-            String origin = message.optString("origin");
+            String origin = message.optString("origin", null);
             launchWebapp(origin);
         }
     }

From 8ed47e3fcdd99ccf50e999ba78a21eb02c81f63f Mon Sep 17 00:00:00 2001
From: Paul Rouget <paul@mozilla.com>
Date: Fri, 6 Jun 2014 12:01:51 +0800
Subject: [PATCH 005/103] Bug 1020972 - validate project if icon & name are
 unknown. r=dcamp

---
 browser/devtools/webide/content/webide.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/browser/devtools/webide/content/webide.js b/browser/devtools/webide/content/webide.js
index ac270100504..49640624714 100644
--- a/browser/devtools/webide/content/webide.js
+++ b/browser/devtools/webide/content/webide.js
@@ -616,11 +616,10 @@ let Cmds = {
         projectsNode.appendChild(panelItemNode);
         panelItemNode.setAttribute("label", project.name || AppManager.DEFAULT_PROJECT_NAME);
         panelItemNode.setAttribute("image", project.icon || AppManager.DEFAULT_PROJECT_ICON);
-        if (!project.validationStatus) {
-          // The result of the validation process (storing names, icons, …) has never been
-          // stored in the IndexedDB database. This happens when the project has been created
-          // from the old app manager. We need to run the validation again and update the name
-          // and icon of the app
+        if (!project.name || !project.icon) {
+          // The result of the validation process (storing names, icons, …) is not stored in
+          // the IndexedDB database when App Manager v1 is used.
+          // We need to run the validation again and update the name and icon of the app.
           AppManager.validateProject(project).then(() => {
             panelItemNode.setAttribute("label", project.name);
             panelItemNode.setAttribute("image", project.icon);

From 5a5655621286eeeae1ad5b29b62fce4b01bc1160 Mon Sep 17 00:00:00 2001
From: Paul Rouget <paul@mozilla.com>
Date: Fri, 6 Jun 2014 12:01:52 +0800
Subject: [PATCH 006/103] Bug 1007057 - build appmgr v2: remove configure
 option. r=mshal r=ochameau

---
 browser/app/profile/firefox.js                |  6 +---
 browser/devtools/moz.build                    |  4 +--
 browser/devtools/webide/content/webide.js     |  2 ++
 browser/devtools/webide/test/head.js          | 10 +++---
 browser/devtools/webide/test/test_cli.html    |  3 --
 browser/devtools/webide/test/test_import.html |  3 ++
 .../devtools/webide/test/test_runtime.html    | 36 ++++++++-----------
 browser/installer/package-manifest.in         |  2 --
 configure.in                                  | 13 -------
 9 files changed, 25 insertions(+), 54 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index cb92730e3b1..52d71b4f0d7 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1237,12 +1237,8 @@ pref("devtools.appmanager.enabled", true);
 pref("devtools.appmanager.lastTab", "help");
 pref("devtools.appmanager.manifestEditor.enabled", true);
 
-// Enable devtools webide
-#ifdef MOZ_DEVTOOLS_WEBIDE
-pref("devtools.webide.enabled", true);
-#else
+// Disable devtools webide until bug 1007059
 pref("devtools.webide.enabled", false);
-#endif
 
 // Toolbox preferences
 pref("devtools.toolbox.footer.height", 250);
diff --git a/browser/devtools/moz.build b/browser/devtools/moz.build
index d09a23c79ef..b07ea014a21 100644
--- a/browser/devtools/moz.build
+++ b/browser/devtools/moz.build
@@ -28,11 +28,9 @@ DIRS += [
     'tilt',
     'webaudioeditor',
     'webconsole',
+    'webide',
 ]
 
-if CONFIG['MOZ_DEVTOOLS_WEBIDE']:
-    DIRS += ['webide']
-
 EXTRA_COMPONENTS += [
     'devtools-clhandler.js',
     'devtools-clhandler.manifest',
diff --git a/browser/devtools/webide/content/webide.js b/browser/devtools/webide/content/webide.js
index 49640624714..af335c706f7 100644
--- a/browser/devtools/webide/content/webide.js
+++ b/browser/devtools/webide/content/webide.js
@@ -157,12 +157,14 @@ let UI = {
   unbusy: function() {
     document.querySelector("window").classList.remove("busy")
     this.updateCommands();
+    this._busyPromise = null;
   },
 
   busyUntil: function(promise, operationDescription) {
     // Freeze the UI until the promise is resolved. A 30s timeout
     // will unfreeze the UI, just in case the promise never gets
     // resolved.
+    this._busyPromise = promise;
     let timeout = setTimeout(() => {
       this.unbusy();
       UI.reportError("error_operationTimeout", operationDescription);
diff --git a/browser/devtools/webide/test/head.js b/browser/devtools/webide/test/head.js
index 97797a95046..219675161c0 100644
--- a/browser/devtools/webide/test/head.js
+++ b/browser/devtools/webide/test/head.js
@@ -62,17 +62,15 @@ function closeWebIDE(win) {
 }
 
 function removeAllProjects() {
-  let deferred = promise.defer();
-  AppProjects.load().then(() => {
+  return Task.spawn(function* () {
+    yield AppProjects.load();
     let projects = AppProjects.store.object.projects;
     for (let i = 0; i < projects.length; i++) {
-      AppProjects.remove(projects[i].location);
+      yield AppProjects.remove(projects[i].location);
     }
-    deferred.resolve();
   });
-
-  return deferred.promise;
 }
+
 function nextTick() {
   let deferred = promise.defer();
   SimpleTest.executeSoon(() => {
diff --git a/browser/devtools/webide/test/test_cli.html b/browser/devtools/webide/test/test_cli.html
index 124a0d2273c..3c192785e70 100644
--- a/browser/devtools/webide/test/test_cli.html
+++ b/browser/devtools/webide/test/test_cli.html
@@ -19,15 +19,12 @@
         SimpleTest.waitForExplicitFinish();
 
         Task.spawn(function* () {
-          let clClass = Components.classes["@mozilla.org/toolkit/command-line;1"].createInstance();
-
           Cu.import("resource://gre/modules/devtools/dbg-server.jsm");
           DebuggerServer.init(function () { return true; });
           DebuggerServer.addBrowserActors();
 
           let win = yield openWebIDE();
 
-
           let packagedAppLocation = getTestFilePath("app");
 
           let cli = "actions=addPackagedApp&location=" + packagedAppLocation;
diff --git a/browser/devtools/webide/test/test_import.html b/browser/devtools/webide/test/test_import.html
index 95f190d64f7..041870b4909 100644
--- a/browser/devtools/webide/test/test_import.html
+++ b/browser/devtools/webide/test/test_import.html
@@ -22,6 +22,9 @@
             let win = yield openWebIDE();
             let packagedAppLocation = getTestFilePath("app");
 
+            yield win.AppProjects.load();
+            is(win.AppProjects.store.object.projects.length, 0, "IDB is empty");
+
             yield win.Cmds.importPackagedApp(packagedAppLocation);
 
             let project = win.AppManager.selectedProject;
diff --git a/browser/devtools/webide/test/test_runtime.html b/browser/devtools/webide/test/test_runtime.html
index 3dba1fdf3c5..658fa6d8765 100644
--- a/browser/devtools/webide/test/test_runtime.html
+++ b/browser/devtools/webide/test/test_runtime.html
@@ -49,10 +49,9 @@
 
           win.AppManager.update("runtimelist");
 
-          let hostedAppManifest = TEST_BASE + "hosted_app.manifest";
-          yield win.Cmds.importHostedApp(hostedAppManifest);
+          let packagedAppLocation = getTestFilePath("app");
 
-          yield win.Cmds.showRuntimePanel();
+          yield win.Cmds.importPackagedApp(packagedAppLocation);
 
           let panelNode = win.document.querySelector("#runtime-panel");
           let items = panelNode.querySelectorAll(".runtime-panel-item-usb");
@@ -65,36 +64,27 @@
 
           items[0].click();
 
-          yield deferred.promise;
+          ok(win.document.querySelector("window").className, "busy", "UI is busy");
+          yield win.UI._busyPromise;
 
           is(Object.keys(DebuggerServer._connections).length, 1, "Connected");
 
+          ok(isPlayActive(), "play button is enabled 1");
+          ok(!isStopActive(), "stop button is disabled 1");
+          let oldProject = win.AppManager.selectedProject;
+          win.AppManager.selectedProject = null;
+
           yield nextTick();
 
           ok(!isPlayActive(), "play button is disabled 2");
           ok(!isStopActive(), "stop button is disabled 2");
-
-          win.AppManager.selectedProject.errorsCount = 0;
+          win.AppManager._selectedProject = oldProject;
           win.UI.updateCommands();
 
           yield nextTick();
 
           ok(isPlayActive(), "play button is enabled 3");
           ok(!isStopActive(), "stop button is disabled 3");
-          let oldProject = win.AppManager.selectedProject;
-          win.AppManager.selectedProject = null;
-
-          yield nextTick();
-
-          ok(!isPlayActive(), "play button is disabled 4");
-          ok(!isStopActive(), "stop button is disabled 4");
-          win.AppManager._selectedProject = oldProject;
-          win.UI.updateCommands();
-
-          yield nextTick();
-
-          ok(isPlayActive(), "play button is enabled 5");
-          ok(!isStopActive(), "stop button is disabled 5");
 
 
           yield win.Cmds.disconnectRuntime();
@@ -102,8 +92,8 @@
           is(Object.keys(DebuggerServer._connections).length, 0, "Disconnected");
 
           ok(win.AppManager.selectedProject, "A project is still selected");
-          ok(!isPlayActive(), "play button is disabled 6");
-          ok(!isStopActive(), "stop button is disabled 6");
+          ok(!isPlayActive(), "play button is disabled 4");
+          ok(!isStopActive(), "stop button is disabled 4");
 
           deferred = promise.defer();
           win.AppManager.connection.once(
@@ -122,6 +112,8 @@
 
           DebuggerServer.destroy();
 
+          yield removeAllProjects();
+
           SimpleTest.finish();
 
         });
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index bd7ca8a40c2..79691e603aa 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -636,11 +636,9 @@
 #endif
 
 ; [Webide Files]
-#ifdef MOZ_DEVTOOLS_WEBIDE
 @BINPATH@/browser/chrome/webide@JAREXT@
 @BINPATH@/browser/chrome/webide.manifest
 @BINPATH@/browser/@PREF_DIR@/webide-prefs.js
-#endif
 
 ; shell icons
 #ifdef XP_UNIX
diff --git a/configure.in b/configure.in
index 970e25d9955..6da6b1e01db 100644
--- a/configure.in
+++ b/configure.in
@@ -7680,19 +7680,6 @@ if test "$MOZ_CHROME_FILE_FORMAT" != "jar" &&
     AC_MSG_ERROR([--enable-chrome-format must be set to either jar, flat, or omni])
 fi
 
-dnl ========================================================
-dnl = Enable Support for devtools webide
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(devtools-webide,
-[  --enable-devtools-webide Set compile flags necessary for compiling devtools webide ],
-MOZ_DEVTOOLS_WEBIDE=1,
-MOZ_DEVTOOLS_WEBIDE= )
-
-if test -n "$MOZ_DEVTOOLS_WEBIDE"; then
-    AC_DEFINE(MOZ_DEVTOOLS_WEBIDE)
-fi
-AC_SUBST(MOZ_DEVTOOLS_WEBIDE)
-
 dnl =========================================================
 dnl Omnijar packaging (bug 552121)
 dnl =========================================================

From c5b89833a56166814acdbc14c5a53b22e202f19b Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Thu, 5 Jun 2014 21:07:56 -0700
Subject: [PATCH 007/103] Backed out changeset 1c4cdf7294f4 (bug 1021443) until
 its dependent refactoring lands.

---
 mobile/android/base/webapp/EventListener.java | 46 +++++++++++--------
 mobile/android/base/webapp/InstallHelper.java | 10 ++--
 mobile/android/base/webapp/WebappImpl.java    |  5 +-
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/mobile/android/base/webapp/EventListener.java b/mobile/android/base/webapp/EventListener.java
index 2312d1bd3a7..07537f21c0d 100644
--- a/mobile/android/base/webapp/EventListener.java
+++ b/mobile/android/base/webapp/EventListener.java
@@ -5,6 +5,33 @@
 
 package org.mozilla.gecko.webapp;
 
+import org.mozilla.gecko.ActivityHandlerHelper;
+import org.mozilla.gecko.AppConstants;
+import org.mozilla.gecko.GeckoAppShell;
+import org.mozilla.gecko.GeckoEvent;
+import org.mozilla.gecko.GeckoProfile;
+import org.mozilla.gecko.favicons.decoders.FaviconDecoder;
+import org.mozilla.gecko.gfx.BitmapUtils;
+import org.mozilla.gecko.util.ActivityResultHandler;
+import org.mozilla.gecko.EventDispatcher;
+import org.mozilla.gecko.util.EventCallback;
+import org.mozilla.gecko.util.NativeEventListener;
+import org.mozilla.gecko.util.NativeJSObject;
+import org.mozilla.gecko.util.ThreadUtils;
+import org.mozilla.gecko.WebappAllocator;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.util.Log;
+
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -13,25 +40,6 @@ import java.util.Set;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.mozilla.gecko.ActivityHandlerHelper;
-import org.mozilla.gecko.EventDispatcher;
-import org.mozilla.gecko.GeckoAppShell;
-import org.mozilla.gecko.GeckoProfile;
-import org.mozilla.gecko.util.ActivityResultHandler;
-import org.mozilla.gecko.util.EventCallback;
-import org.mozilla.gecko.util.NativeEventListener;
-import org.mozilla.gecko.util.NativeJSObject;
-import org.mozilla.gecko.util.ThreadUtils;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.util.Log;
 
 public class EventListener implements NativeEventListener  {
 
diff --git a/mobile/android/base/webapp/InstallHelper.java b/mobile/android/base/webapp/InstallHelper.java
index 8f60f5ea2d5..eda6d8b0ddd 100644
--- a/mobile/android/base/webapp/InstallHelper.java
+++ b/mobile/android/base/webapp/InstallHelper.java
@@ -19,9 +19,7 @@ import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.GeckoProfile;
 import org.mozilla.gecko.gfx.BitmapUtils;
-import org.mozilla.gecko.util.EventCallback;
-import org.mozilla.gecko.util.NativeEventListener;
-import org.mozilla.gecko.util.NativeJSObject;
+import org.mozilla.gecko.util.GeckoEventListener;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import android.content.Context;
@@ -29,7 +27,7 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.util.Log;
 
-public class InstallHelper implements NativeEventListener {
+public class InstallHelper implements GeckoEventListener {
     private static final String LOGTAG = "GeckoWebappInstallHelper";
     private static final String[] INSTALL_EVENT_NAMES = new String[] {"Webapps:Postinstall"};
     private final Context mContext;
@@ -38,7 +36,7 @@ public class InstallHelper implements NativeEventListener {
 
     public static interface InstallCallback {
         // on the GeckoThread
-        void installCompleted(InstallHelper installHelper, String event, NativeJSObject message);
+        void installCompleted(InstallHelper installHelper, String event, JSONObject message);
 
         // on the GeckoBackgroundThread
         void installErrored(InstallHelper installHelper, Exception exception);
@@ -164,7 +162,7 @@ public class InstallHelper implements NativeEventListener {
     }
 
     @Override
-    public void handleMessage(String event, NativeJSObject message, EventCallback callback) {
+    public void handleMessage(String event, JSONObject message) {
         EventDispatcher.getInstance().unregisterGeckoThreadListener(this, INSTALL_EVENT_NAMES);
 
         if (mCallback != null) {
diff --git a/mobile/android/base/webapp/WebappImpl.java b/mobile/android/base/webapp/WebappImpl.java
index 7dceb19d940..5adc670b59f 100644
--- a/mobile/android/base/webapp/WebappImpl.java
+++ b/mobile/android/base/webapp/WebappImpl.java
@@ -18,7 +18,6 @@ import org.mozilla.gecko.GeckoThread;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
-import org.mozilla.gecko.util.NativeJSObject;
 import org.mozilla.gecko.webapp.InstallHelper.InstallCallback;
 
 import android.content.Intent;
@@ -326,13 +325,13 @@ public class WebappImpl extends GeckoApp implements InstallCallback {
     }
 
     @Override
-    public void installCompleted(InstallHelper installHelper, String event, NativeJSObject message) {
+    public void installCompleted(InstallHelper installHelper, String event, JSONObject message) {
         if (event == null) {
             return;
         }
 
         if (event.equals("Webapps:Postinstall")) {
-            String origin = message.optString("origin", null);
+            String origin = message.optString("origin");
             launchWebapp(origin);
         }
     }

From b822a12997735c64f7c9306ffba7a264cdb6fea8 Mon Sep 17 00:00:00 2001
From: Paul Rouget <paul@mozilla.com>
Date: Fri, 6 Jun 2014 12:46:44 +0800
Subject: [PATCH 008/103] Bug 1021504 - add a very simple template. r=dcamp

---
 browser/devtools/webide/webide-prefs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/devtools/webide/webide-prefs.js b/browser/devtools/webide/webide-prefs.js
index 6fec54c1577..4a938bf73a5 100644
--- a/browser/devtools/webide/webide-prefs.js
+++ b/browser/devtools/webide/webide-prefs.js
@@ -4,6 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 pref("devtools.webide.showProjectEditor", true);
-pref("devtools.webide.templatesURL", "http://fixme/");
+pref("devtools.webide.templatesURL", "http://people.mozilla.org/~prouget/webidetemplates/template.json"); // See bug 1021504
 pref("devtools.webide.lastprojectlocation", "");
 pref("devtools.webide.enableLocalRuntime", false);

From 075baf2ad14a16fff9db3d11d71ccc624a6bce19 Mon Sep 17 00:00:00 2001
From: Heather Arthur <fayearthur@gmail.com>
Date: Thu, 5 Jun 2014 23:02:23 -0700
Subject: [PATCH 009/103] Bug 1017248 - Show @media sidebar for original
 sources in style editor; r=bgrins

---
 .../devtools/styleeditor/StyleEditorUI.jsm    | 81 ++++++++++++-------
 .../devtools/styleeditor/StyleSheetEditor.jsm | 38 +++++----
 browser/devtools/styleeditor/test/browser.ini |  5 ++
 .../test/browser_styleeditor_init.js          |  2 +-
 ...er_styleeditor_media_sidebar_sourcemaps.js | 72 +++++++++++++++++
 .../test/browser_styleeditor_reload.js        |  8 +-
 .../browser_styleeditor_selectstylesheet.js   |  7 +-
 .../test/browser_styleeditor_sourcemaps.js    |  6 +-
 browser/devtools/styleeditor/test/head.js     |  5 +-
 .../test/media-rules-sourcemaps.html          | 12 +++
 .../test/sourcemap-css/media-rules.css        |  8 ++
 .../test/sourcemap-css/media-rules.css.map    |  6 ++
 .../test/sourcemap-sass/media-rules.scss      | 11 +++
 13 files changed, 208 insertions(+), 53 deletions(-)
 create mode 100644 browser/devtools/styleeditor/test/browser_styleeditor_media_sidebar_sourcemaps.js
 create mode 100644 browser/devtools/styleeditor/test/media-rules-sourcemaps.html
 create mode 100644 browser/devtools/styleeditor/test/sourcemap-css/media-rules.css
 create mode 100644 browser/devtools/styleeditor/test/sourcemap-css/media-rules.css.map
 create mode 100644 browser/devtools/styleeditor/test/sourcemap-sass/media-rules.scss

diff --git a/browser/devtools/styleeditor/StyleEditorUI.jsm b/browser/devtools/styleeditor/StyleEditorUI.jsm
index df28eea64c7..d1be563c46a 100644
--- a/browser/devtools/styleeditor/StyleEditorUI.jsm
+++ b/browser/devtools/styleeditor/StyleEditorUI.jsm
@@ -454,26 +454,23 @@ StyleEditorUI.prototype = {
           }
         }, false);
 
-        Task.spawn(function* () {
-          // autofocus if it's a new user-created stylesheet
-          if (editor.isNew) {
-            yield this._selectEditor(editor);
-          }
+        // autofocus if it's a new user-created stylesheet
+        if (editor.isNew) {
+          this._selectEditor(editor);
+        }
 
-          if (this._styleSheetToSelect
-              && this._styleSheetToSelect.stylesheet == editor.styleSheet.href) {
-            yield this.switchToSelectedSheet();
-          }
+        if (this._styleSheetToSelect
+            && this._styleSheetToSelect.stylesheet == editor.styleSheet.href) {
+          this.switchToSelectedSheet();
+        }
 
-          // If this is the first stylesheet and there is no pending request to
-          // select a particular style sheet, select this sheet.
-          if (!this.selectedEditor && !this._styleSheetBoundToSelect
-              && editor.styleSheet.styleSheetIndex == 0) {
-            yield this._selectEditor(editor);
-          }
-
-          this.emit("editor-added", editor);
-        }.bind(this)).then(null, Cu.reportError);
+        // If this is the first stylesheet and there is no pending request to
+        // select a particular style sheet, select this sheet.
+        if (!this.selectedEditor && !this._styleSheetBoundToSelect
+            && editor.styleSheet.styleSheetIndex == 0) {
+          this._selectEditor(editor);
+        }
+        this.emit("editor-added", editor);
       }.bind(this),
 
       onShow: function(summary, details, data) {
@@ -712,7 +709,8 @@ StyleEditorUI.prototype = {
    *         Editor to update @media sidebar of
    */
   _updateMediaList: function(editor) {
-    this.getEditorDetails(editor).then((details) => {
+    Task.spawn(function* () {
+      let details = yield this.getEditorDetails(editor);
       let list = details.querySelector(".stylesheet-media-list");
 
       while (list.firstChild) {
@@ -722,12 +720,31 @@ StyleEditorUI.prototype = {
       let rules = editor.mediaRules;
       let showSidebar = Services.prefs.getBoolPref(PREF_MEDIA_SIDEBAR);
       let sidebar = details.querySelector(".stylesheet-sidebar");
-      sidebar.hidden = !showSidebar || !rules.length;
+
+      let inSource = false;
 
       for (let rule of rules) {
+        let {line, column, parentStyleSheet} = rule;
+
+        let location = {
+          line: line,
+          column: column,
+          source: editor.styleSheet.href,
+          styleSheet: parentStyleSheet
+        };
+        if (editor.styleSheet.isOriginalSource) {
+          location = yield editor.cssSheet.getOriginalLocation(line, column);
+        }
+
+        // this @media rule is from a different original source
+        if (location.source != editor.styleSheet.href) {
+          continue;
+        }
+        inSource = true;
+
         let div = this._panelDoc.createElement("div");
         div.className = "media-rule-label";
-        div.addEventListener("click", this._jumpToMediaRule.bind(this, rule));
+        div.addEventListener("click", this._jumpToLocation.bind(this, location));
 
         let cond = this._panelDoc.createElement("div");
         cond.textContent = rule.conditionText;
@@ -737,25 +754,29 @@ StyleEditorUI.prototype = {
         }
         div.appendChild(cond);
 
-        let line = this._panelDoc.createElement("div");
-        line.className = "media-rule-line theme-link";
-        line.textContent = ":" + rule.line;
-        div.appendChild(line);
+        let link = this._panelDoc.createElement("div");
+        link.className = "media-rule-line theme-link";
+        link.textContent = ":" + location.line;
+        div.appendChild(link);
 
         list.appendChild(div);
       }
+
+      sidebar.hidden = !showSidebar || !inSource;
+
       this.emit("media-list-changed", editor);
-    });
+    }.bind(this)).then(null, Cu.reportError);
   },
 
   /**
    * Jump cursor to the editor for a stylesheet and line number for a rule.
    *
-   * @param  {MediaRuleFront} rule
-   *         Rule to jump to.
+   * @param  {object} location
+   *         Location object with 'line', 'column', and 'source' properties.
    */
-  _jumpToMediaRule: function(rule) {
-    this.selectStyleSheet(rule.parentStyleSheet, rule.line - 1, rule.column - 1);
+  _jumpToLocation: function(location) {
+    let source = location.styleSheet || location.source;
+    this.selectStyleSheet(source, location.line - 1, location.column - 1);
   },
 
   destroy: function() {
diff --git a/browser/devtools/styleeditor/StyleSheetEditor.jsm b/browser/devtools/styleeditor/StyleSheetEditor.jsm
index 715c65d14bf..784c11abe14 100644
--- a/browser/devtools/styleeditor/StyleSheetEditor.jsm
+++ b/browser/devtools/styleeditor/StyleSheetEditor.jsm
@@ -96,21 +96,14 @@ function StyleSheetEditor(styleSheet, win, file, isNew, walker) {
   this.checkLinkedFileForChanges = this.checkLinkedFileForChanges.bind(this);
   this.markLinkedFileBroken = this.markLinkedFileBroken.bind(this);
 
-  this.mediaRules = [];
-  if (this.styleSheet.getMediaRules) {
-    this.styleSheet.getMediaRules().then(this._onMediaRulesChanged);
-  }
-  this.styleSheet.on("media-rules-changed", this._onMediaRulesChanged);
-
   this._focusOnSourceEditorReady = false;
-
-  let relatedSheet = this.styleSheet.relatedStyleSheet;
-  if (relatedSheet) {
-    relatedSheet.on("property-change", this._onPropertyChange);
-  }
-  this.styleSheet.on("property-change", this._onPropertyChange);
+  this.cssSheet.on("property-change", this._onPropertyChange);
   this.styleSheet.on("error", this._onError);
-
+  this.mediaRules = [];
+  if (this.cssSheet.getMediaRules) {
+    this.cssSheet.getMediaRules().then(this._onMediaRulesChanged);
+  }
+  this.cssSheet.on("media-rules-changed", this._onMediaRulesChanged);
   this.savedFile = file;
   this.linkCSSFile();
 }
@@ -131,6 +124,17 @@ StyleSheetEditor.prototype = {
     return this._isNew;
   },
 
+  /**
+   * The style sheet or the generated style sheet for this source if it's an
+   * original source.
+   */
+  get cssSheet() {
+    if (this.styleSheet.isOriginalSource) {
+      return this.styleSheet.relatedStyleSheet;
+    }
+    return this.styleSheet;
+  },
+
   get savedFile() {
     return this._savedFile;
   },
@@ -530,7 +534,9 @@ StyleSheetEditor.prototype = {
     this._friendlyName = null;
     this.savedFile = returnFile;
 
-    this.sourceEditor.setClean();
+    if (this.sourceEditor) {
+      this.sourceEditor.setClean();
+    }
 
     this.emit("property-change");
 
@@ -628,8 +634,8 @@ StyleSheetEditor.prototype = {
     if (this.sourceEditor) {
       this.sourceEditor.destroy();
     }
-    this.styleSheet.off("media-rules-changed", this._onMediaRulesChanged);
-    this.styleSheet.off("property-change", this._onPropertyChange);
+    this.cssSheet.off("property-change", this._onPropertyChange);
+    this.cssSheet.off("media-rules-changed", this._onMediaRulesChanged);
     this.styleSheet.off("error", this._onError);
   }
 }
diff --git a/browser/devtools/styleeditor/test/browser.ini b/browser/devtools/styleeditor/test/browser.ini
index 51bdd54df35..d47bb0cc8f7 100644
--- a/browser/devtools/styleeditor/test/browser.ini
+++ b/browser/devtools/styleeditor/test/browser.ini
@@ -16,6 +16,7 @@ support-files =
   media.html
   media-rules.html
   media-rules.css
+  media-rules-sourcemaps.html
   minified.html
   nostyle.html
   pretty.css
@@ -30,7 +31,10 @@ support-files =
   sourcemap-css/contained.css
   sourcemap-css/sourcemaps.css
   sourcemap-css/sourcemaps.css.map
+  sourcemap-css/media-rules.css
+  sourcemap-css/media-rules.css.map
   sourcemap-sass/sourcemaps.scss
+  sourcemap-sass/media-rules.scss
   sourcemaps.html
   test_private.css
   test_private.html
@@ -49,6 +53,7 @@ skip-if = os == "linux" || "mac" # bug 949355
 [browser_styleeditor_inline_friendly_names.js]
 [browser_styleeditor_loading.js]
 [browser_styleeditor_media_sidebar.js]
+[browser_styleeditor_media_sidebar_sourcemaps.js]
 [browser_styleeditor_new.js]
 [browser_styleeditor_nostyle.js]
 [browser_styleeditor_pretty.js]
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_init.js b/browser/devtools/styleeditor/test/browser_styleeditor_init.js
index 488ea24a2e9..a4602bf9432 100644
--- a/browser/devtools/styleeditor/test/browser_styleeditor_init.js
+++ b/browser/devtools/styleeditor/test/browser_styleeditor_init.js
@@ -20,7 +20,7 @@ function testEditorAdded(aEditor)
 {
   if (aEditor.styleSheet.styleSheetIndex == 0) {
     gEditorAddedCount++;
-    testFirstStyleSheetEditor(aEditor);
+    gUI.editors[0].getSourceEditor().then(testFirstStyleSheetEditor);
   }
   if (aEditor.styleSheet.styleSheetIndex == 1) {
     gEditorAddedCount++;
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_media_sidebar_sourcemaps.js b/browser/devtools/styleeditor/test/browser_styleeditor_media_sidebar_sourcemaps.js
new file mode 100644
index 00000000000..dc3a07663da
--- /dev/null
+++ b/browser/devtools/styleeditor/test/browser_styleeditor_media_sidebar_sourcemaps.js
@@ -0,0 +1,72 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// https rather than chrome to improve coverage
+const TESTCASE_URI = TEST_BASE_HTTPS + "media-rules-sourcemaps.html";
+const MEDIA_PREF = "devtools.styleeditor.showMediaSidebar";
+const MAP_PREF = "devtools.styleeditor.source-maps-enabled";
+
+const LABELS = ["screen and (max-width: 320px)",
+                "screen and (min-width: 1200px)"];
+const LINE_NOS = [4, 4];
+
+waitForExplicitFinish();
+
+let test = asyncTest(function*() {
+  Services.prefs.setBoolPref(MEDIA_PREF, true);
+  Services.prefs.setBoolPref(MAP_PREF, true);
+
+  let {UI} = yield addTabAndOpenStyleEditors(2, null, TESTCASE_URI);
+
+  yield listenForMediaChange(UI);
+
+  is(UI.editors.length, 1, "correct number of editors");
+
+  // Test editor with @media rules
+  let mediaEditor = UI.editors[0];
+  yield openEditor(mediaEditor);
+  testMediaEditor(mediaEditor);
+
+  Services.prefs.clearUserPref(MEDIA_PREF);
+  Services.prefs.clearUserPref(MAP_PREF);
+});
+
+function testMediaEditor(editor) {
+  let sidebar = editor.details.querySelector(".stylesheet-sidebar");
+  is(sidebar.hidden, false, "sidebar is showing on editor with @media");
+
+  let entries = [...sidebar.querySelectorAll(".media-rule-label")];
+  is(entries.length, 2, "two @media rules displayed in sidebar");
+
+  testRule(entries[0], LABELS[0], LINE_NOS[0]);
+  testRule(entries[1], LABELS[1], LINE_NOS[1]);
+}
+
+function testRule(rule, text, lineno) {
+  let cond = rule.querySelector(".media-rule-condition");
+  is(cond.textContent, text, "media label is correct for " + text);
+
+  let line = rule.querySelector(".media-rule-line");
+  is(line.textContent, ":" + lineno, "correct line number shown");
+}
+
+/* Helpers */
+
+function openEditor(editor) {
+  getLinkFor(editor).click();
+
+  return editor.getSourceEditor();
+}
+
+function listenForMediaChange(UI) {
+  let deferred = promise.defer();
+  UI.once("media-list-changed", () => {
+    deferred.resolve();
+  })
+  return deferred.promise;
+}
+
+function getLinkFor(editor) {
+  return editor.summary.querySelector(".stylesheet-name");
+}
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_reload.js b/browser/devtools/styleeditor/test/browser_styleeditor_reload.js
index 16e98ce2b69..94f14ba5b38 100644
--- a/browser/devtools/styleeditor/test/browser_styleeditor_reload.js
+++ b/browser/devtools/styleeditor/test/browser_styleeditor_reload.js
@@ -27,7 +27,11 @@ function test()
 function runTests()
 {
   let count = 0;
-  gUI.once("editor-selected", (event, editor) => {
+  gUI.on("editor-selected", function editorSelected(event, editor) {
+    if (editor.styleSheet != gUI.editors[1].styleSheet) {
+      return;
+    }
+    gUI.off("editor-selected", editorSelected);
     editor.getSourceEditor().then(() => {
       info("selected second editor, about to reload page");
       reloadPage();
@@ -41,7 +45,7 @@ function runTests()
       })
     });
   });
-  gUI.selectStyleSheet(gUI.editors[1].styleSheet.href, LINE_NO, COL_NO);
+  gUI.selectStyleSheet(gUI.editors[1].styleSheet, LINE_NO, COL_NO);
 }
 
 function testRemembered()
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_selectstylesheet.js b/browser/devtools/styleeditor/test/browser_styleeditor_selectstylesheet.js
index d613d4331b1..5ee8b3d189c 100644
--- a/browser/devtools/styleeditor/test/browser_styleeditor_selectstylesheet.js
+++ b/browser/devtools/styleeditor/test/browser_styleeditor_selectstylesheet.js
@@ -30,7 +30,12 @@ function runTests()
 
   // Make sure Editor doesn't go into an infinite loop when
   // column isn't passed. See bug 941018.
-  gUI.once("editor-selected", (event, editor) => {
+  gUI.on("editor-selected", function editorSelected(event, editor) {
+    if (editor.styleSheet != gUI.editors[1].styleSheet) {
+      return;
+    }
+    gUI.off("editor-selected", editorSelected);
+
     editor.getSourceEditor().then(() => {
       is(gUI.selectedEditor, gUI.editors[1], "second editor is selected");
       let {line, ch} = gUI.selectedEditor.sourceEditor.getCursor();
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_sourcemaps.js b/browser/devtools/styleeditor/test/browser_styleeditor_sourcemaps.js
index 64181b9fc86..13bfab05a11 100644
--- a/browser/devtools/styleeditor/test/browser_styleeditor_sourcemaps.js
+++ b/browser/devtools/styleeditor/test/browser_styleeditor_sourcemaps.js
@@ -104,9 +104,13 @@ function togglePref(UI) {
       deferred.resolve();
     }
   })
+  let editorsPromise = deferred.promise;
+
+  let selectedPromise = UI.once("editor-selected");
 
   Services.prefs.setBoolPref(PREF, false);
-  return deferred.promise;
+
+  return promise.all([editorsPromise, selectedPromise]);
 }
 
 function openEditor(editor) {
diff --git a/browser/devtools/styleeditor/test/head.js b/browser/devtools/styleeditor/test/head.js
index eeeb3789b1d..0cbb41ff6c2 100644
--- a/browser/devtools/styleeditor/test/head.js
+++ b/browser/devtools/styleeditor/test/head.js
@@ -45,9 +45,10 @@ function addTabAndOpenStyleEditors(count, callback, uri) {
   let deferred = promise.defer();
   let currentCount = 0;
   let panel;
-  addTabAndCheckOnStyleEditorAdded(p => panel = p, function () {
+  addTabAndCheckOnStyleEditorAdded(p => panel = p, function (editor) {
     currentCount++;
-    info(currentCount + " of " + count + " editors opened");
+    info(currentCount + " of " + count + " editors opened: "
+         + editor.styleSheet.href);
     if (currentCount == count) {
       if (callback) {
         callback(panel);
diff --git a/browser/devtools/styleeditor/test/media-rules-sourcemaps.html b/browser/devtools/styleeditor/test/media-rules-sourcemaps.html
new file mode 100644
index 00000000000..4876ef79595
--- /dev/null
+++ b/browser/devtools/styleeditor/test/media-rules-sourcemaps.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <link rel="stylesheet" type="text/css" href="sourcemap-css/media-rules.css"
+</head>
+<body>
+  <div>
+    Testing style editor media sidebar with source maps
+  </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/browser/devtools/styleeditor/test/sourcemap-css/media-rules.css b/browser/devtools/styleeditor/test/sourcemap-css/media-rules.css
new file mode 100644
index 00000000000..fad540a9643
--- /dev/null
+++ b/browser/devtools/styleeditor/test/sourcemap-css/media-rules.css
@@ -0,0 +1,8 @@
+@media screen and (max-width: 320px) {
+  div {
+    width: 100px; } }
+@media screen and (min-width: 1200px) {
+  div {
+    width: 400px; } }
+
+/*# sourceMappingURL=media-rules.css.map */
\ No newline at end of file
diff --git a/browser/devtools/styleeditor/test/sourcemap-css/media-rules.css.map b/browser/devtools/styleeditor/test/sourcemap-css/media-rules.css.map
new file mode 100644
index 00000000000..76cd48fe23f
--- /dev/null
+++ b/browser/devtools/styleeditor/test/sourcemap-css/media-rules.css.map
@@ -0,0 +1,6 @@
+{
+"version": 3,
+"mappings": "AAIE,oCAA4C;EAD9C,GAAI;IAEA,KAAK,EAAE,KAAK;AAEd,qCAA4C;EAJ9C,GAAI;IAKA,KAAK,EAAE,KAAK",
+"sources": ["../sourcemap-sass/media-rules.scss"],
+"file": "media-rules.css"
+}
diff --git a/browser/devtools/styleeditor/test/sourcemap-sass/media-rules.scss b/browser/devtools/styleeditor/test/sourcemap-sass/media-rules.scss
new file mode 100644
index 00000000000..4f1c8f216fc
--- /dev/null
+++ b/browser/devtools/styleeditor/test/sourcemap-sass/media-rules.scss
@@ -0,0 +1,11 @@
+$break-small: 320px;
+$break-large: 1200px;
+
+div {
+  @media screen and (max-width: $break-small) {
+    width: 100px;
+  }
+  @media screen and (min-width: $break-large) {
+    width: 400px;
+  }
+}

From 5568c6a3353fa3edd09b2e203772379242b08969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Fri, 6 Jun 2014 08:53:35 +0200
Subject: [PATCH 010/103] Bug 1018582 - Get rid of #navigator-toolbox::before
 and #TabsToolbar::after on OS X. r=MattN

---
 browser/themes/osx/browser.css | 96 ++++++++++------------------------
 1 file changed, 28 insertions(+), 68 deletions(-)

diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 0cb35f81173..c9c40798ba1 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -109,12 +109,6 @@ toolbarseparator {
   background: url(chrome://browser/skin/Toolbar-background-noise.png) hsl(0,0%,83%);
 }
 
-#TabsToolbar:not([collapsed="true"]) + #nav-bar {
-  /* Position the toolbar above the bottom of background tabs */
-  position: relative;
-  z-index: 1;
-}
-
 #nav-bar {
   -moz-appearance: none;
   background: url(chrome://browser/skin/Toolbar-background-noise.png),
@@ -138,6 +132,19 @@ toolbarseparator {
   }
 }
 
+/* Draw the bottom border of the tabs toolbar when it's not using
+   -moz-appearance: toolbar. */
+#main-window:-moz-any([sizemode="fullscreen"],[customize-entered]) #TabsToolbar:not([collapsed="true"]) + #nav-bar,
+#main-window:not([tabsintitlebar]) #TabsToolbar:not([collapsed="true"]) + #nav-bar,
+#TabsToolbar:not([collapsed="true"]) + #nav-bar:-moz-lwtheme {
+  border-top: 1px solid hsla(0,0%,0%,.3);
+  background-clip: padding-box;
+  margin-top: -@tabToolbarNavbarOverlap@;
+  /* Position the toolbar above the bottom of background tabs */
+  position: relative;
+  z-index: 1;
+}
+
 #nav-bar-customization-target {
   padding: 4px;
 }
@@ -2770,33 +2777,14 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   box-shadow: @focusRingShadow@;
 }
 
-/* We want the titlebar to be unified, but we still want to be able
- * to give #TabsToolbar a background. So we can't set -moz-appearance:
- * toolbar on #TabsToolbar itself. Instead, we set it on a box of the
- * right size which is put underneath #TabsToolbar.
- *
- * Because of Bug 941309, we make sure this pseudoelement always exists,
- * but we only make it visible when we need it.
- */
-#navigator-toolbox::before {
-  content: '';
-  display: block;
-  -moz-appearance: toolbar;
-  height: @tabMinHeight@;
-  margin-bottom: -@tabMinHeight@;
-  visibility: hidden;
-}
-
-#main-window:not([customizing]) #navigator-toolbox[inFullscreen]:not(:-moz-lwtheme)::before,
-#main-window:not(:-moz-any([customizing],[tabsintitlebar])) #navigator-toolbox:not(:-moz-lwtheme)::before {
-  visibility: visible;
-}
-
 #TabsToolbar {
-  position: relative;
   -moz-appearance: none;
-  background-repeat: repeat-x;
-  margin-bottom: -@tabToolbarNavbarOverlap@;
+  margin-bottom: -1px; /* Overlap the inner highlight at the top of the nav-bar */
+}
+
+#main-window:not([customizing]) #navigator-toolbox[inFullscreen] > #TabsToolbar:not(:-moz-lwtheme),
+#main-window:not(:-moz-any([customizing],[tabsintitlebar])) #navigator-toolbox > #TabsToolbar:not(:-moz-lwtheme) {
+  -moz-appearance: toolbar;
 }
 
 #TabsToolbar:not(:-moz-lwtheme) {
@@ -2804,32 +2792,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   text-shadow: @loweredShadow@;
 }
 
-/*
- * Draw the bottom border of the tabstrip when core doesn't do it for us.
- * Because of Bug 941309, we make sure this pseudoelement always exists,
- * but we only make it visible when we need it.
- */
-#TabsToolbar::after {
-  content: '';
-  /* Because we use placeholders for window controls etc. in the tabstrip,
-   * and position those with ordinal attributes, and because our layout code
-   * expects :before/:after nodes to come first/last in the frame list,
-   * we have to reorder this element to come last, hence the
-   * ordinal group value (see bug 853415). */
-  -moz-box-ordinal-group: 1001;
-  position: absolute;
-  bottom: @tabToolbarNavbarOverlap@;
-  left: 0;
-  right: 0;
-  z-index: 0;
-  border-bottom: 1px solid hsla(0,0%,0%,.3);
-  visibility: hidden;
-}
-
-#main-window:-moz-any([sizemode="fullscreen"],[customize-entered]) #TabsToolbar::after,
-#main-window:not([tabsintitlebar]) #TabsToolbar::after,
-#TabsToolbar:-moz-lwtheme::after {
-  visibility: visible;
+@media (-moz-mac-lion-theme) {
+  #navigator-toolbox[inFullscreen] > #TabsToolbar {
+    padding-top: @spaceAboveTabbar@;
+  }
 }
 
 #tabbrowser-tabs {
@@ -4058,17 +4024,6 @@ menulist.translate-infobar-element > .menulist-dropmarker {
   margin-left: 1em;
 }
 
-/* Lion Fullscreen window styling */
-@media (-moz-mac-lion-theme) {
-  #navigator-toolbox[inFullscreen]::before {
-    /* Adjust by the full element height of #titlebar, since that element is
-     * not displayed in native full-screen.
-     * Also add the height of the tabs, since we're calculating the
-     * total height of this pseudo-element, not just the top-padding. */
-    height: calc(@tabMinHeight@ + @spaceAboveTabbar@) !important;
-  }
-}
-
 #full-screen-warning-message {
   background-image: url("chrome://browser/skin/fullscreen-darknoise.png");
   color: white;
@@ -4421,6 +4376,11 @@ window > chatbox {
   border-bottom-width: 0;
 }
 
+#main-window[customize-entered] #nav-bar {
+  border-top-left-radius: 2.5px;
+  border-top-right-radius: 2.5px;
+}
+
 /* Compensate for the border set above for this horizontal line. */
 #main-window[customize-entered] #navigator-toolbox::after {
   margin-left: 3px;

From 9fc79584da7ca3fe848975094f5ebe69f849af1a Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Fri, 6 Jun 2014 08:30:37 +0100
Subject: [PATCH 011/103] bug 1007629 - eliminate use of "embedded" fonts in
 about:preferences. r=gavin

---
 browser/themes/shared/incontentprefs/preferences.css | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/browser/themes/shared/incontentprefs/preferences.css b/browser/themes/shared/incontentprefs/preferences.css
index 1874e0a5837..3d36afc0854 100644
--- a/browser/themes/shared/incontentprefs/preferences.css
+++ b/browser/themes/shared/incontentprefs/preferences.css
@@ -5,11 +5,6 @@
 %endif
 @namespace html "http://www.w3.org/1999/xhtml";
 
-@font-face {
-  font-family: "Clear Sans";
-  src: url("chrome://browser/content/fonts/ClearSans-Regular.woff") format('woff');
-}
-
 page {
   -moz-appearance: none;
   background-color: white;
@@ -39,7 +34,7 @@ caption > label {
 prefpane {
   max-width: 800px;
   padding: 0;
-  font-family: "Clear Sans", sans-serif;
+  font: message-box;
   font-size: 1.25rem;
   line-height: 22px;
   color: #424E5A;
@@ -292,7 +287,6 @@ menulist > menupopup menuitem,
 button[type="menu"] > menupopup menu,
 button[type="menu"] > menupopup menuitem {
   -moz-appearance: none;
-  font-family: "Clear Sans", sans-serif;
   font-size: 1.25rem;
   line-height: 22px;
   height: 40px;
@@ -488,7 +482,6 @@ radio[disabled="true"] > .radio-check {
 
 .category-name {
   line-height: 22px;
-  font-family: "Clear Sans", sans-serif;
   font-size: 1.25rem;
   padding-bottom: 2px;
   -moz-padding-start: 9px;
@@ -694,7 +687,6 @@ filefield {
 #typeColumn,
 #actionColumn {
   -moz-appearance: none;
-  font-family: "Clear Sans", sans-serif;
   line-height: 20px;
   color: #333333;
   height: 36px;

From a32cc70c4a8d1dc5b6d86d94d32285c8bad31d8c Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Fri, 6 Jun 2014 08:30:54 +0100
Subject: [PATCH 012/103] bug 1007639 - stop shipping .woff fonts as part of
 the desktop browser product. r=gavin

---
 .../base/content/fonts/ClearSans-Regular.woff   | Bin 25376 -> 0 bytes
 browser/base/content/fonts/FiraSans-Light.woff  | Bin 26440 -> 0 bytes
 .../base/content/fonts/FiraSans-Regular.woff    | Bin 26228 -> 0 bytes
 browser/base/jar.mn                             |   3 ---
 4 files changed, 3 deletions(-)
 delete mode 100644 browser/base/content/fonts/ClearSans-Regular.woff
 delete mode 100644 browser/base/content/fonts/FiraSans-Light.woff
 delete mode 100644 browser/base/content/fonts/FiraSans-Regular.woff

diff --git a/browser/base/content/fonts/ClearSans-Regular.woff b/browser/base/content/fonts/ClearSans-Regular.woff
deleted file mode 100644
index 00c279d2e9f4b95f230b58ef897dfe689e6c36cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25376
zcmZsBV{~Rsu=Nw$wr$(CZD(TJwr$(ColG!sGI1uhotyXGKi`k9&)TO~?XGI9#;Q}N
z-4(>e0YHGCWI_l){4Z~G`0xGyOXA|HazA>YKV`W8!Qz(#n1TueGXMaz`y(6vhbP29
z2oqbQpE^Kge|V1{OnrUbGMc!#5CQ<OE<ZZ#Kipp!58PXG2Mb#O0Bqz3Q~&^!V(NfD
zz{1G+$JY4eM-TRY0Re!pu<<kp0N@P)0Jd8IKn3#AqVC<&%*gbo9-AK>rXR3_goSBX
z{*XUh!H-Pv15yMFFe^)2m!CcW3;qBK001$pjx%+%HgmEA07O**0Q6}9fP+?_+%Uw(
z-sHy?w&usa=|424XMfomdHnPRXaE2J5dH_?Hy}MbBU>{7K<7sWR|EhMgy%3)=N#;v
zf5!FSn1RB6+5uLw$#QUTGW(ICZ+^JIAFQm=St@vJm>8NG8Uprl{@nAA-*5VuB^(<9
z0-eW?u7Vc6pFU{*?HV(HI&ooU2o?bXRpAbQ8vQ?;-HhjF+Ju(R_G1Gc2n-NKP_VxM
zK=w8G-cQv(N^1Zi0N4*e0l+_V$N*6Lp&I~|0Fa+j5Ksf4gr8CXSQZ$|4^QxaImiOQ
z9Qel+7zPXk1Q-|?1hfDEe60xZc>f_Ge*lnEkXHZ*0^o?zz!p9ifU+R-fLRCuK>0hX
zKXZ!(X8EJ?BYJGuCNo*0DB+Iv_dNT%bAX;^6>@Un7IK0n7Ka3wQjSX5Q96krK`BF$
zi6kI$n^F=BNkc}Y5Nk_^;RH!S!RwW9qB>IU6B3seN8=)o2*vDp+cH{#2=uvMf9`a@
z`|rpEH0MKqS5O;ETpL<~S4f2!Ar={Vc~qb?F5Rz@w?FVBFOKI`>xuq8g#uo&mrSFX
zz{f}I{swOq+Q4<MJV)2DZ?uq21g`o**CrQ~@-s9Qc9F%ebYV=&m^=3=vkJ|!Ya&1R
zAdBgVu(l>0^Y!$qBj|WSufBsVT;F|xB)ev*x`SRViB;^9d_cp!%f43Lyo1sSnslc+
zzH>rx^_+S3vQ*ASF09n1>~h4Y1oo<8{B`54!WN#s4YT5;&#vcdb?$;x$*1ExqE>f#
z2217~5ru!yH6!PD2E@l}PT)x2c-F)Fyxq%DY=QM&;NKRuqnOUz_lnlyiVyX!)#P3C
z>=tKj@JOB4(TTnyIioLMDlyk@xR9$emT^yl$COS&`@ZQRZ|oG`yHtCPvDZ5u^n2(Z
zBZ#x4E;=+)r|ne%^Y1-@HxG&04O(+YEk>5pMUL}#Fb@dTYua!vRPyqfeI(cX9=9(A
z=NAa~e)e^a<`)?AJ?7%Onx**p+vCpi7?ZblVY~!o!7}%itw#<PkCO@%+C;M$e>_WX
z4QAc8@9>?+sX5V~<?!EHH8eC2FvJ2E2S?-tK4c1drG=#lXu%E!P8bC@y=7iv`mkU%
zg*E3MbBR8U3yKIz3Camd3Q7%%7LFXkCR_Oa9wfg3cBKVW!30&Is3#~U097@MDvy7B
zpMO()BYfvS^q&w6@3i~x@UA@>-UrJetO#Vh8V&`IKxjY13vG#j8kz=s0L_>KBg>vZ
zV`6G*uCH-%c6NAryuN^ehK7iVj*gI#mX?^A{yRiNO-)f#U0z~iZEbONd3=C_jg66$
z{XIiRTU%pmb9sS>o13GjyY-ikx3|aF=ko&uI5<c|czB3}xVXr~_+TFeIT>?<r^~Bs
zCa2%@_Rqg*^&0JFugfmDa}K+WCfoC;T%M<^_4fQiPByx8<9|g%xM6oTVYBP7WU#PU
zXojo*R+wx4Zlxq47#}Y)k#e;E=5%^EtaLtB$X_3Ih}fHIl}Qg|R<mGWY<X&Xa8=0Q
ztn}Y-3Hwp_&E<0;iUcxzYgNDs$ej1@_1K72SFlHsK+V^qASH#@8;9bAwYA{sD76`|
zrMeUbv1!&9*(Z-eA-OE$s~INd;&&9UO34$<_KENdY0t^Y^EoL@jT))62=M}ia;)%@
z*~!-9k(XYU?rygCyY9_=-f>gUKBw7PN>9J~Th|$Fz|(HGt@(2H#`ZqVQ0M3OuUSE$
zQn!!QUhm^&NP-}3ZW=-M_RIS^@4(_%+CqMA7PTB^jHkTpE*XVld|W;z?$9Onw>24M
zXWwcd7e`1>jkJiM-{Ye+*cvN`nUHQJXgV_$W@`Z2Ib-t?#Y`gzrx6~8R;cc}he^>L
zGzNZ5%5CCwEhK%-dl{?WF^FFPx5LV#Tyn7fm<5#93vIh7=ot1sxk4hDp*4T+Rxk#8
z&<s0>?y9dxeLq}KJ67l1n$UGdX0^5r=_^+|v<<n@E5?Ai)J5y>0J;G%7&xW`<?=>o
zOBQ=UnjrS>Aaa7<pryP``^Z2H*Afg{6Vc)u#<Kdwh%93C+b)BSpc3XT_<q(8Q>UTS
zt4}D<3}8)WrpO6WAdit?(dnHf)WYN5^T^q;az>v;(>e)zh@34%D6P>BqH>RkQ~Zag
zFfG{SH&v!mWs=<x7?VmQW1JlH2ED|Y=l$Ng!8TzUg2{@<T!c<^Xi{2@rwuty4TDWl
z$oe4;8yIPKHM$huy;iXp?<6?KR5j^0Bwni>gi6^KMfF7YKaT{NeDI4ej|GN<s8Mo!
zAHm1Q^(}OkIOFl49}!3Jj&j<KkkXc37g9ZN2>0C4DM?d=wpG~a#HqLz?PP`))yXUR
z*7XM8<~D*~3MkFNuR?OA8KKP3Jf=?NVs>75NY~pMbyrlY4f>(0m49TSG(Rust?b|Q
zb-cnciVh?Xr^a37P>yJoV@%>@ZNw~nt(ckNFU#|G)54xQc3GFh+0@`~#LLy-m?=@#
zNZIy7mI)abdx|MzQVC-9(}>GZ#-|ufu#V;?&h@hD>)-WLX|9FbKXK}%KhXX>wgT0p
zDw5ar?Ei{6!)e-<tS;Cx7&6}&cq6>0%$lrL$xnMxDY0%sA9Iw8(#9RDy&9ZNLk){b
z_Tl&24Hb6n3wu%M#<lVW!Zgz9j*}|$s;*rvTzg6Tqk?j&&P{74wRmJsbTVD@iNkZw
zQsYtMeb&6@5!v?7k=RkG`1a3e<-lM=rQAYNH~-ThpIWok;Mdx~Fqf+|J*D?1j#fYe
zc5_f+=jwza?+9yUxLY^;<`CQk>xT=&8oK{bPE=?oOyuIZv-vf$Mfn_7ML4pvT9y5W
zgdD=Evu?uTzP8w?LF^`^m)yfG1J2kb?UvZ;oFiYcOCE{U(9mrwz=F0^l4+0%3rCqZ
z*-(@5?2WGv5wbYoKu#o+2i+A;e!=2SBi5WEn@LayaLKv{Yf*`P+R4Js3^7X5!#PuB
zy;gexL1@*##gW29+BL57I@Cgn;IBeLm%a24`w^K#CGsCYet|bkg<(19$!QgX)3-qf
zCkipoQl&{KM2!s`m><?1Aun7F+uM>k@}{Q7QBK6WW#!91^x81=y8)x6v1_n10zabK
zqxLMVEMIK$NDE^@Pv&q+>5DMRH`8CdeVexlhg;+JLg;|Qw?gaF`Ol|qG=lv#t_j2A
zIwxM=F~X^autjv_5<UmAgm+Kl=`~JF<ha~-WZkJ<2PWxp;_)@i7;flU2(l!O5RUrl
zO$)_aN7C^-ya`VfPZ6NCe|0%yXzV>>?8@~KmE|oXZcQ?Z3tGh=`wN_zqx?VD#$zKi
zPDVyp32}T*so74i*Y!Tbt9b^89RIYCj~!%`PQ%^gOxRf^p?62YOHc^1l`_b3p*_Rx
z32p<uwa$#7xKVAs2&8{!<{K7-<@WLR^!midn<6*oEjD>^cbeuABE000?#~AKFV|uF
z8oQj!kf$f#B4@|YmIm1>+SiyVWmg{5zmEh8;NEc&;okJu5%1LL8Y5VaLYOARjMO6$
z^WmXs=vLB{B13$XIUqrg(VF=j+vQ{>98|3pr<ZK4b$0e8I*Zzys->M`t{m)@@*2TY
z9U^QVYbchmo}$*_67H|OQj&tW#`7>r5rP<)hyWmN%Yp!$oB_gYdWR)ja|~LWW7T`~
zvQj-~ai@$VcItJf+r;~9<j<mmrZFuby>vDRG+(DO-I`lNUtP95%wyQg^)pwgDaP5&
zSK_>InT#rq_C4fgCbrnHUz7gZCcJ5bqUP|)nd_B1Ao30Q@F1M>;a}^jXBZaFX|Zx#
z#5!XMQhS+0lwiv(eLxCK4p#r?Cw$&~6M=wOg9p<N0~1os1^{c4VjW^0u`qu4!|n&F
z3Qzc#!m5JcD$WcsLRY{5Mr2{be+>WML=R90906GZ9Rm9RrvZ-u-+_pNIDlk;)Pc-^
z9D$O8N`gj!o`B(l*@2CL9f50uw}2l(kU~g9*g>R0oIwUac0s{HX+p(8bwF)HGea9f
zM?v>MKfu7kh{HI*G{79eio(XgUckY_3By^!Rlr@r<HC!=o5Bac7r{@#Z^OSJXd_f0
zTp%(d`XF{7AtOm5IUzM5ogf2{)sdr+hfu&#lu?3EHc-(~<xyQwn@}InxY3N!YS2c|
z5z*y;9v=(<hAzetrXZ#%<{cI}Rs}XFwkWnCwk7rj4loWUjuTEDE-Wr7t|4v$ZXNC!
z9z32fUI1PKUIAVMJ}^E!J~lo%J~KW)zBGOY0V)9@0WAS1fhd6@fi8h1feXO^!3@C~
z!6Cs7!3QBEp(f!P;UVD-;Rg{U5h{@)Q58`e(Gbxr(FV~G(H(Id2{;Kd2|fum2|I}}
zi9Crmi8;wG$py&^DJUr-DK04`sXFN&(rwZ+(kC)tGI%m|GGj6~vMF*wa&z(&@+tCN
z@+S&H3P}nFiattMN^MFn$~?*;$_*-5Dj%wl|Mpw04~&oMa_jT<G1uHoCd-`ZU6yPT
z(Fh}HxD+H1a}TO<4CZ14tJnzQkW37wNK9f`ClX0WfT18ZlXg@J4izymWf2f)ty5q$
zmDrS83A#aRnz~FN*Xzo*1vx@V`)A*dM8=Hi+>BpM>y!3*|I;__NWpBMOh<0LIBiow
zi6ZQnxsthNnh>UQn4p4RfyAUxXeb|7;6>uvI5m6su8b5y+?1MAj>pqRNbzjYJl(n{
z3i<J#+tW-cP3St<VB;X6aD))gTI38zi#<|lXbmqqruzKbN;L3za^Jrb$Ul2NwxD;0
z+gf>!%C%tz^I~2vB;>gd8li{=ke{B4$Zu*V^77#*vgXZ$Vf!X{Ny}C!uuaorO?jG=
zmQi98zbUwK>4BVcvN2Fl^nytEx9i#`ntmq~EUrI}Wng9pVt{6E9W-@s=_li(*J!2+
z`o#-t*rndrPW8Xa%u0kx7Ye5rA0BEJGZ@O%tnQilvcExkor)MuiUhjV$KKBlakskr
zE%H8cEXytXLV8<N`wwf~XCEEx4waobaGJ2scBj{>c4IGb|CPpv^Kc{4FI-8MDBcLQ
z2=38pDXtHsInWX0{&hm`;!nvyMDp7d*{0Fa@fKd9i5AE9!y)Y-SgyW3s*N!>cHXXG
z>@Vi&TPpPJqG*xEMv@0^%}!)RubS6}Fu`~k$A6$+iben%KnX|@lx6iIHY?Z=^JUP<
z4VcQOr+m6AC^*a{40W977+KkSZ6qcPeD`9g#2~=|lZM-eVDek~N-7#d{`%d{_qvPw
zX3*|gch~F{v;nt12gsb(%T15O%?e!oxk4VRzw%oSoc-MP&C6T*=$RG0ySUbAvw5rE
z5<}*CngLom=kms;Us4S{+YA^IA^!3M9?J7wu4K6E1elZJ{AJ;TOEcD1%8X-^{<S!J
z@E&<43#PAZ*l>x(gL2OTQPf}}vYwltpUc)E1lkbu<ZxA{NCAa6X}(Qr50`xSh>2Ld
z5yO1{1@J5uLN$J%FO_K}Cj|#5^;SA^Fy50WEo!CpZBp=-hI(UI?dn&RKL1+m_4RsZ
z^ktrtMc4Q2WU9c|?Xv$&u9o9Y3Xh74O!5u?$J=P~87hzehcr9Ozx(8uM*%#ZuTpLH
zuf%ce^YK<UcY(n}-mgD#Xa@w<{xx>I3%=GnU~4#Zlt5+$N+*%?q`X#34jMkZPGh5E
zPJbNAS#<7jVskJi*K>Z;INs802%k~LD8(#ZD@d}z6W|9UBimLoF&Wp;5z*7Thg7Ts
zAw`hGog>H*fPxB$V1p!T+)Ut~K8^<nDhC&j9q=+nMO299WFI4o8pCI`=pHb|8SRE9
zC1;QS&Qo(Wyd_w&E<RtC&kIfe+D~Ph+t;D_$PH}`S8MC>S>Y=k1e;zG(AY`-s;0o#
zJ}_{4??5o<>-Id2m+mS%2!d;s+3u0hYdgXCiWcadSVl{kp@mrqhu&B|n{-c=%ld9E
zGHpPS^+C~>_f6(89YBg7cV4Lw;6`^8|A#~%+Se>qYqovdFJ_*C$V?I+kf6mFT{Jo%
z?gq=0A^c*@ZIXJ(D@Le5FYa!5JPQ&IkH>S{ru~k@ABMLU9G|yY&%GRdMxZ)}<HBD$
z@6K|G)5CbGg9<u=4U5iFl)DIVxs^tvLpD~=Ihm~K_42vujnLP5E`U(o%J%~7W)jlR
z_m#-4-COV_h4+qi+8y-Rz*1mOLk(jVpp#C@H?5sW7PffGMH1DhnXpV9S)*SLa!i;3
zM+l#dixeu%&bRf_u(>Ay1s=)=)J0K%<Px)J!;f=4H{{7%-SCT^#XNbbpAmuatdxmU
zsFx93^&Jpi`+5eJGtg!Ser$f0wYbjZ&B9*ozr|~zLNVhABYn{K&nf}wRYYCfRJ7#S
zgQOgTaX3S6q4SXNl1i{BaoGaQ06Oi+wL!W2Z1{NNmI4;Vvyi+!xz)YO!jXp?Yys|}
z#=;Cn7}y#an8I5!-LQ{PajktJK|ID;LAyY3GMkafKg)oRXTP(^aPZ_~5(Rr3CgH2<
zM!zh*60|!}Uko#cintF5Y1|OT3r}qZxu?AwM=AHu8ng*cq9+GzY{*2wuV52PZ&trq
zEXdp&y$DDfkdqj(*#vx+2qKZa3akLv4Ij<*##B%L><t<(#Mt&&-{a2G4=2pIP+p?s
z;Mmp^F%;p(Cd5x;1S|rX7>>-fG7c?svaxhweG$r|G=25@%GJJad}qy<ulX>HE_S;M
zFC&m<8Cw;D0W=S)57i2tW%i3v^2ek%rVrgACeuF5eY$MGyOhEO26^<~B0^@bkQnfy
zo@8hy{WF2yg4SEvJY%z}<@9__t)#V~JnKKPIrjspu?<&fkdB$V<NJ#06GrTr4{Nc1
zy`)@{f15XtX3r#ECJ@Z$D8PHB@+m{bSyT?AiGF*?vSAGy)|>ou?>BIMM`44}0A-i^
ze8_z6!)`r<a}{v@n2${EfAJjck+4A9c|J)h_NLDBx9WdeW-r?5gTW2D{X9uil-9;B
zL5mEc#9q@>(9Pjdaw#d1a>Sn`$xuO@LS*X{7YQRbS|fSDxXpSUk-x;X+{{mhY!1rU
zeFRIDw3#>0iilhwGls7`TeUSfw3D{ZUhY)qQ&rpUa~(|rdH(eINY{%esIjrNz8a(P
zR-miQNH*ALdb`$xV^ed^%WU>gIt}Zj>GlcB&4QB!ePs*4huxJD43ZpoCPz77hYm8F
z&opAulGPO~#GafCJUv3Sij;N{Fj_l>=X+{;cMp|dp=j$bZ42)=GOei?Z)l3P?Q3g@
z{teAg%B~I4)HJLKWhqQKdDJF_AFqd!Hcj85=hnT;N|HjlX(Oumnzhf`X<4-xlCmgL
zN(!5XoCseclR&6s=JZsZ-aSh-_o6=g>1naLsKAitNwbK<pOUGSzVi;|_Zg$Dp`NMH
z*V=nqSvfO`u^g^@wG&8-ZRjU7UkX!N@R2Z{l#@d^9fUJ_1_$0ui2dNTa^O&+oiylw
zoX|O$r6km)A{ne7C%VtKjt>c(E)%kwHzQsnb2H3K#;}%sXlkzaiAz!37v5b?Pp9dW
z?M2MzFR`qXuXpO}RO;1uxNhhT+=r2VAl+m9XXNPvcsZZx_F+8Ve`mQB$osD6?0Lt^
z+mGy|4)u^K;U#Dbcp55(@I<reI(6dfcOc~MqmhFTy!k%UnEPe@g;L$|s9h2WZQ$e4
zpw|}bbtd}VY0hx?yU*>qjZKeO$m$(r?i|I)lvDy**)$}W1T5xF0zhF|<SXg^z8D=h
z<&QX{5(8H7pz*roi~I;;ziq<XOEFW<v`T%>`x8&j>wL|JfS=FPePe1gM|=LSU%zzn
znmrs%vfW*N&-r=z?{&%LUUuB=>Rexpk3rmB_w-wCo_7lcv7}ISX9j7>q|Z*|s+Um8
z44;q9QPDuAsVnF<^klAaYFU8mSx{qRNCQ>}w2dFVi1@dMxJ{Djh@HCSf^Z4)uUM2y
zm5Zb4qe^NQbmdvvd6SA2{c~t_E@3f?2>!J9NYYbOg29nxcVB|>TzS7Y`}>4+!o>T0
zZxF2PYuIn%&e&@{9BxdTK-2r=GZj96SfmefU43@H{mDa<9kaa7mcaMx6Zw?gOlL)R
zXk6kDA$8I;RgVW9BwZB624fxPrDW8!$0RM9yJ%B<S~C=~yK4Qn&@gD(7#FuEL`5W1
z6B}oQL^}D4g{w6oeer%y9K|<ye|I2a@#9`aBFTf(V?GoSPQoTrn55XeTW6j#VuxkG
z&6fxU0w^$0HpmQc<wyzekQB=LJ9$J=h#Z{kXtNhp&o{(Bn}L0MEAQI6u`OlR3g+Em
zzwQ-<lPqi=7d}DJ6k(#phY`RQkeGCpVmUv06Hr%obrhA!uu`Msys=rIts*XI4w`q&
zm;pULgxOFlnpI65Yys{_%1|-R*h#m0iru;InA-s^uvTf#k>n|N)ji@Cyv4=lZ_J7*
zdZH*BmpqC&8>tILIXIzJTM2H$D*jJGP?V@um`>S<W)Mn*1PvWeB*69GxQ-4s2HP7u
z<+UB(?K4l_cJ4}i6HY_Vu7=t@J~ds2O5?-tbaVTU(_V??=wK%Z@a5|3X!?xups~U#
z#kOcO7G!7_Zlk{)OBYH_Io6FO=I@J(DlEuNoi6<ZW>D(y9X^YkD(bkxq1!b?%^G*L
zNbQ^rj&~sTi^qYnAyU|hSK(xcClHe%G!>eaG>}2pvU`{ij)e&i-pMLh=agJ(QsTUi
z_(@606kYrtW=6H2m2lH-e;)-T@O>@4&2P5DmyefyuPf`X2OmAo47P8sRQfMO&WZ`X
z@ay|RH1_!Rj>53car*PR<0duwHRj^;`yLA8)%~L3N(UWQLIyHdZ}naRSC{p!E8myQ
zv@SEt9cawIVl;9!U<|r^HQK!_1IcN?eC!xrbdiXU))a#Z7KvsiCD{$rR-L&)Kp>%D
z=SomSjVZVi{}zW!h6;ZTMS!BpQe)_&JM;z3`9#m*YNLPc?%}=cdiK3diR;$dnUWrX
zMJ+xLWY961!^X-6CM>2Hw%<qQ*c@mji(QA+P%Y<8{1T$dpXl9j73*O-RMf769`I82
zB5w;Shy*FC2N<+h?C7hE@5!CLhDEK=ovnV~R&OJ;)lp@)RNYs9@^D}r#BJmEd0jrG
zDvWNn?H0paDbrw7jNQG9SM&`C+X`?5#`D3jqsBLh(4!LAgQOTn|FdBSv51Te&tX`g
z5;v9@8H#kZM$bbZen~=t%R<B+LHfiZH|%ak(RpUAxURHtz@DuWn9u3HEz68g&E<S>
zyB_8#)75V9V9g81*nREry7=&>j<%at?pGGj=vQa>Iuw#K*c5WZW9@fLz+Ii1P8z^Q
za?*M&<f_YE7#W$|CmeKPt@iJ$aodZMS^In`#On8ST`c31uwd?1dmN^CJxe|F|2~+Y
zaIV+Sd1p!lT0ns?!IFBE9>3R&H-&E&M{;uHYXlF9dQ$@-2S|?KcwQLE48dd?zW5&f
z>U$G&U0`2sr~5<U9eXsXf0K+E9TZa_(2IW`v_f*q*i>n0kdVrCgG|oyw>!Q!^E|L_
zC}Fo3b78?7^&TS(xi*1jJTPhh!A%Dk7I}OWa{fpd3Q8)dTHx0eQ7AQ?1fJ^R0O^vL
ztEduM$VdcqF1`GuU*Y57;5R>iuWMIV^1`amN6K5>8`11g=H|B_&v9laB&&-MU%9^2
z{az(QST{`hKK1<Gr^i*38WNXXnbQm`7pBsoM?!Ipg{L}17E3fOlPh)^5Xpl*Wdd;x
zo+&iKQ}a#o`x6twwaM8q&CA&h{}H+%3~GF!lFOey7Gd_a+NL}V%?YnYcpS|(0xoT~
z!J~oii$pBUoMeO`aF;okF#r1%9oZ`#dsoNIIeza}j5pP{S(f)gg~$`V0>F;B5fov3
zWMXaNJ_guO);7d(-R@@L;%B!!S`C7{yndSBc+5j@$JeI`)a-BNp_4MS3x<|YG1EKl
zTzCBmlYt^hGvJqOHp7{-2T6NYaZ;3ZQ*C|l?+F-X?Lp#Hgi7JYaWw-LNXrd^;eI3O
z%qmwabjee@qtP4xkjsTz%^T4Oi9h)0lL5L&wG@iYWMSPF1owmnzHBYE{(e3zKHH#)
z^!js6z~QDs;F(Uu)fSq;k!Xlf3rfXcffL%lQ&t4o;F7Sk8{-S0GYX9V$ydtBET`pa
z+#rAKlGW{HO)+Z>!i3Sy7!Y@nGOx=$i)%}on*mJ{M-%CugAGowTm&QzAVN<DQ<)Bq
z@Xv;9x*Nf;*kQE)vjU?n4yPf_Wv+mKn&4U^`OH`|UvTCa8JVcY@?pjfikz#&SQe<t
zuQD*gGPDPF!}mG8*-Q8HZLpy5h)q31=Y>FTft*t_0O;m~m;f;HA#^`DYzn@jYAOTX
zXn0J;ktw7a4(Ny-wd5nE8MvXitYq{FwA7naVm#a&bifQM)8{URvl-uC2ibV|*B+Om
zgx$td<CkUo-rDo)eR+EX{JFHMyV7|SZsXz)DJK5iZD3WWw|mCqz_ghC^UUQTC#O^5
z*oCi=CS_W=LtzH7nmLVOBSsQmN;)J`<`TG01i3cz@dx5D`rWwZdlclmT~wmg*G6|u
z;Nz(=x7n{g_tv$+2k?}>QRam)ezk%enJbs0jAUv;X+RsV-l_a9{?h;CVSk+dg)%V-
z+f0CW_Y>}rb4FpF8#|H1+-=;piED+sfVB2^D)o%<F-AmMNSv=2|GYEtUON72Lbx87
zp{UJv$bBnM&HnPbElgV&5x8H5h_e&ehr2fP);X?xx{&<HhI3;9G4(_d!dx*LP8viw
z(bDk|7Ivati=R71MJA+;i%0>a1fIg~`YQus-@vn=W3dNcBpS5iBo;`;6k=!+|CvAd
zK98kt@>uojJXin4LWry1SXX^0uYdMuHqyJAJJ)bAO=XkMZ}s&=vg3T&{MOX+>@nKw
zX!6NN#i6y%Ykz*28eL{NUQz=uH-Eoq^kmUUezgeTJ-5^c(M(E28gC|sxG|_dXK+-e
z#i}gg%DC#aN}$>EszV3P@lo20|M}1<o(~5Z4WB`uHMe-AZCckA*CSNsqlpR8ZW0H_
z&0pTW2I(wTv)JMKIQ{F3vPq!RXFkMlz7O^|)g;kyWy1cs!Qs74^}TQop-F)!5jo-l
zR2oh=5HyCx4o&1j%VJpbYAPBEY`CwI;heslg#SUP|3+@}N^FPl0OlaNCi=NDq8J4<
zO-z9^SjjveKO4}X55b?hDCA_pnrR#&Icw;;P|_A&;+o}6<QEfDJieiLlh43kuCG>~
zqx5_^3X3jp41%uzZ>r91c#XlKxz29C%Fsu0u+#i()gG=ikY?4nXySyZkTe?E$Pyg~
zwg60@0@6IqD27rSODPQaCZc$?hLRa915Sv7&*~P-2Zo-nZd=xhfM@w~2H#xc#Xlp(
zLCb?V8I8Ym-9fx0uRw$&6nD3d3mlhvJSmBq;>-m+uUo!lp=H=&`LO#GuJwd8FDN>m
zx$Xu-7M6#_2jQOgvKzSTUfBRnA1)dZx4?pLmzspeDuAH?R#cZvk_LV4yuxrc#NIp~
zo`Nae&1nV0-}ABAwxwUhimo|V0O|=Fhxu+oM43cekF1+-zt}eM?-^oW#nqsgRjua2
zT|6G$!+WX~gEzM}gBa*>BQHybKJ@vZjhp8BSdRjAS-QZY=@Q^zw(uZnQ2{d@LLqo0
zFqWCoYhH$>7#!0RVWyx>jMBEV2kgz#Lb}t~s=tyb66|BZI4`&ZY-PFugqS={Y^W&j
zHnH<UeMj-xZsa_F?3~DyBP?6%xRqft=dJHrB&V<*dd1ia%m{L6+|oA_3<{gmo1m(y
z$a$RHj-graX6X2$evlQsp0l8KZH%<S|H})b9b-;|Ls6i+<C?cScUlCW6?O|(dT==G
zRTpZ^BZ-pRCuh;FS&DwroCEHDO)MmgBHE?;Ct6j}rDeICR3%x29<!t{cF@yOII%Jn
zbqIjX+3_HcS1RvUT)vGa;QNL(S6`yj#NK4T%Pr^U``dddpz%BF9|L{XzHMLUe(RIi
zrTY|psh_x#`KzA5`dzjIzDYXm{Z+PFRzfC5xe?$-Mt?pNG?T%Ug3!Es;oqNizM92a
z5LUX=MzliGVx1*1qHH%SCCNLzNb=s#gjCW%b!Htc8jDDE>?_XeOc66Zu&pgHoolX_
z?Yew^=3Wwkev>niYOL-z_s90+=IPhuz4&{XC4q{a&u2eCZZ8Q1E;!jzkPkwDj|r7s
zRBUTNej}$=xfnxcOe5kWU(?N;qY5jG0)7O%_61);??Gm?f!`OE`L+H19K%k7&&3^=
z84NH(3f&mJq^#+MXSdJa!)Ctowi(JCNmJ3ITegXbp#22os8L79fDGN7MN+9IA!ZYm
z9I!%<aLmg11sisWqHxdGAJ?eW;hGpr9kpiI6dI;&*6Y5XpX*L{T85#uZHeEv^x?GU
z>;qXc4m8GbRz!9t6_BlVKP%<>>lY()dNLsjkER|YDoiA6G%tQ68|PM%sXONkq7Dl0
z1g=zA%_~S!<ce%dve4>4P7c(Xf*7gs_nC#genPL8&2tw6Ltg*QAjD=ysT>@fo6qaW
zG#HA-Ob>?4T3B-9Wp)2={e_kF6{%-ma>!HE7Z?g`ET>FdaHIkhQIZvSd^oOLrXo{T
zvDqv^o`s?YVG(jX4j>x%B-@uDXt)!4bD1I79lf78N0Ikp+0zyq%WJ`?=kr|Eif*-u
z&Z;V&$EbpByLzozf7w%FR9T2J;ZW&`W;_+!a-y+g2OYhWDgzWRL$`9`LPj2`1R83s
zTyR{3X^G#GltOX~s0l89NlO8-xV%Pc4)4=>ayq?Ri28-rs&0ds+nhZ=Ukz2g=cq}1
zoz^9{tIzC|7Mv|yfhf)q<Ip5Rs=wa-pmo2eE!YG!BgZ?~T2k(aMYDW3EWCbF3}!;;
zqO2qeSE5ZpxniUsN3B~GP)Y?2W;&zi{zz`=*485Y?0QF**1Y3R#8jmb!bS1bFE)lx
z4G-qTIc-IGxE<)*MPcH=Nu#y~ujt8;78FqBE?QjeE>kG*s!2LZT&^m^zZJz>J@z){
zc5aM34rVkM-jBq_Z&pj%e?{M8$S4=6r`@8*;XZ*gP-N*b&IEE5Ex$!qS7Vt7O(bm{
zR2*!K1gS9VJyyP(oWze>l9<ir8y+FLkToclw&(uACgmdi3)^SS8Rv3A$N#3uDE|w2
zw7#ri)zy9bq;f{vgOP8i+I~k-|9i-wYVd}hE^iPe5A2|E0?2V5C>W5i7}t7w$^_)y
z-SwKR0laZ+<R=WfW`a!(Nk)3&f^OQtV;UZ+kVfmM9JHNa4q$uNWA_%AkH+6YbfvjN
zK;@Twgs<|_I82$InsbcD<2bXp@7^*Qi@oY-?)JWGTZc*Gk#5(R^P^1Hn%6pI$U=Ey
zgjvzB*!Hzp8y<B-=VP?k(?i&~ozZ5Di=eF}kb;sj4B;*YySVY9DY@^O1;_hj&*1bN
zLd2<=A!dgZ5tCEA*T?}qcrXz^>$UfY+lY@SvLJeR5P3WMc(wofm@GHAva;6cwi1(g
zmmVwl()z^ZX~3IL!Xx~*+Rx`v@w}Ee%$ir(nu9UcJg=fqezKP<&v6dQlK49b)NW%J
zbtF(yTuk9Z&=maZ3vH@KR6~|xkMDc7Sz-R=aV%0#Lz?Ff-@m90q$s@#zg{i*h3=ln
z!xx;>l?_UtEga&N9BMSV3iNLG<%KhN-KurmaTYTgZ(p2OmSTa8(kkH+IkIvirY6{j
zl?u37NgVc8nAEA~aqwEw)c3UXqr7~jjqk~FQ+qAXA8hVm#JpyFn8GaGpmO&KoV?HZ
z?(ho@3C9eK9^??@3t|YJgxe!Glu2g7n8`9JGGNUTJeyzimj1}+qhfR8`t&OA?Qbv2
z#|82t-E#;_=i23>6)vlL$cw7PGr*9Kii|AJn2(}Rj!WoTialE}L+R^VrbYr-74=-q
zlRgqw$9@0u2!$lS=W`Wd1(xQ09cQlR-Rb;1v$hmx>bxrb!pj)=smA-ZFVk%Ln!1aM
zVK}|>wlQ@R9W9*=RiU5k5R0idZH8msJ#T$D9z<8%2{v5B!XyVgc$D;vwjmF5p(Ndd
z&h3{I5ow%d%Z+lmcu|@fjfV0lqc`=jOYOzU$r$*fx0(2DNQrHC<~|#z+UIAM!}Z<!
zL1n!M(4k9Sbf{x^sEuaYV8143xtx8X(VCyCBv48kvG`&HQU?Lf(NUr)G3V!H)a!4s
zEvaM**?_GzF5kV&xmG6ou>7!3&S&(a_}w-(-HEI4TjGxSK^@HL{!p0c_G;^Ap|$w+
z(NTTxbUZj;v?MR|2Q%S9#U>yg(OIJ<rul>ZcxW^;Na_bcWP6p4vO4~y@I1BpzNT|&
zo;53u^KLizFupnRL<lVjeN#MfC-P_@tO#(Bc+K#*c1+O)O2EoqqLRhZ`ESHmDANui
zV%3%mL?U%8D0I@~d6T2&eqF8*nkCzEdOiLcyFs)Ly;>vCu`>P$jqq=zFL1_DwzW-B
zclD&lb3;_Vk_p)u340{k9{F+(ryL<cM1)81U^?Ry7kHN&OU0<1mjtMe0Xt}>RF2==
ze?GsU{ym!Ux1PFQjP`9=oupy-p=<7ba_(KoJ|#1PmQ>^DYtv;zu0kCufjdVUOF$S(
zO!o)k$zTx_%nO9gF%O!nYc6_RcDHK7VXm|RoH|jP2=-mPdQ)O}*`Z1&plU9R<;s>g
z@&55rx_nLj#57VK99tAoRg-EPbYL2S$=%(A4r>}r_Uzeh-LDs`ZP_n)daa}W{B5WM
z>&D4KYkj)ubM1Dk9Zyxby!PzrEPY@14fI~xac^gB4~SI{Q0bPvrHmZL7qk#LV64>M
zkCGo~fJ@g2s}X|gbj5Gqgf>)d3Sw}>j_skRr$-~Z#fB4HP-XEzYa{&qRnmgQ*@c}%
zB%@E(g>A50aRh#0r?ooIdv=uP-l&kKA>eC;P@tK?CErWYaIKZ`dT@Q=D}AZkZ@t>(
z8%}cEH3NI4lXm0yK|~W3&2nzKenFh-+RVitmosKX(Wn%KU8*9~VIhe{IfpbnbY&62
zv8}wG$yZldY2>ndb?UBpA8lb4Z?Ct2nX%@{LnDh|ig8G4A$P`XW=d`r|GUpM%FP^}
z*{0laEeKh}JbB#4{E_J>&?ez-&<S{zB7}W3Y_quh-?8y3d4t3_IFZ>;&|G;AP5*M?
z?#B88NFM@{8Lu^jTvJ6^83<^ia(5zUw!=f~$*XbLknvPSY|^w98%6oS3nb~_AQo!v
zoQ+T>W-ucFaYQU2Zy31~=*}{PhH58)R!WaajgV;NpCWl}ku9Z-j71Qu^PGw(GV_Ox
zz|n0qEhs`Z0cfPf5#Qp+Yxz&;zsvBTq%Ee#Rtf;R2_PsVrP+j$ZkJhsn_jlw<!d}=
z1Par=&SyTK9w*c7R_AQ&v0-`!v$pi&iC$*1pbCdrX$Z0x;vY&*C0wHLB77S)WJtPX
z(hZs`UZl9AC$SghuO=;p(r36(+z+Cx6y_mPcdB{))TNDGtYvD-ARNK!AFDZ$XrV8M
z*@wSis4q5`Zme$}c1ZTZK5ns_(ssX&a&xB*##v4+ZEsfLHnGan+sXOVy_5-`o6XVQ
zR@LF{-dOlJe|F}Ps>MNbbk#*NrN*+fJuy$;vWv06B;leC$f260Jab{16gP<hX^A8X
zjE!y{ku-1KzH*wp<yMM;@IN@<lufyE;Y2p&Vv(+oX2vIhwKGF3R4ayteG72C>0a@>
z&N-e7RvWg*5DN38UpQ@urcX>V`s~PO2YKUDbG%8Tve)R*dtFRh=VRHSr1o<@DhwJ0
zo3=P`K1ZkbaQgTo6}^i7n^*buBq}qUdYhWwt9ie6oleFYewH@@$sY!u&d+OjC=y|-
zC+|va=yPLGgM_0B((Ke@D7L+MLh2?C=%XOF_2)W5^>PSl<Uf;vh2fmPSDeYi_<I<?
zti#Ae_&F5AV-(jRGPVo&7m&EJV7-F<Uc?Rn+2J5($xt4-T^{vb0)A7~Z3nWhk5Ie>
z4BS(?b#qz$u-aB>TR1fq_>lER_<}Qp0#Y;%y!%K;tnO4!*c@Rqga#%)!e<4qzh~v$
zs46q{%qHxWSCv<r#s}gg3K~Q18N<waqsEJ$lLG3VOUuf<x#EjJk=L0_LjD4ppofv=
z#zc#G)CBo=UUZ)UtDX5De5MCSpl`2ND}gQwC5L<lPOQf=&ni)>d1)_Xi#-Z5@1oN2
z#H|gay!g%IXV}!!vlq(WjW(}*bM&=&-A}Kni#iypGako~ag|zrs|<7WmA;h+N46%`
ztFtw=^?5wa;NP}aQ~Oeng>dJqb9GtjxIOPH-D#}bN?S^pULI#r7%N*m&y_(~C>E;%
z+RQx<bv$=zvQyrs4=0Vytt|I4fA!m9?4$Rw)aSHtagjqblX2+|zkhZZf?I{zx(N&m
z2-pFLmF)xCz}7&<g`whPG;i=2_8WAFNC60pv~aPKBPAQgMsji@kIBnT&4WvB$X{;y
z3?5#SlDYA9XBOEqrdt7roD|EV#+DSwNl_xw9#zDeoT@{Irr}wKuN+k_&M2uzB&$fh
zqq`#KOLrF1TCkl-w@-cB_sj5(t77MlvUUwyo_FY3|9@(ae0OWTF!5jY2-_Rqe#2!k
zT_IRzH0Z1Be2&(7Uq|lp2OG_YFa%Y#{XFITuSSd29y8YUdrUXAB=vn|eeW9_76M;~
ze|_80s74uFK8u>o&MvUBYG~F-&B@kSDz9as$qtrO>n|c%Fik^x5Wlo0=4+dn*woRH
zq!oJlx};a~6d2ei3Im{Bkm>4<(D#K(76wa~|MH4Ms)kmjv9{UMceavSJ1YBLcCDmw
zp*c$&LztU3t*d-Wf7YB~PhR9@=`kx&<?U2advpn<vygE*#VBMytD+vJHDegQV=ZJT
z_E-k+su{YF{u<=&H5?%>=D0(AhFh2h23HlIVh(pk#ULgA^^h_o<KJALETgtf)IU_Z
zF&%!JEaZcoug<a*bK*=oHy}ee=Rq*m-apm=i?C@hzZ6fb8d0!1^}CNflV(ij2Euws
zXV==-SBbw3wv&d{LBxg;=3mjD1b+{wCf18GBob1+y47l|y_=YroED=@lBOh<WG?Tl
zNmg#Fh%AtaLPt4lM)AuKrOoH>DfD$puJI!i-$o>U>!bd*5zn=@z0jy6hPIqvc3JMz
zEm{g6)-)sLZ7zPBNf3Hg6nS-5BiCWlWwE7qA7R}S^2g~zbuCv!ypNPhd`?MwFJYO(
zdb+JqXMQB!0iFmpE1-!a^rkLO$VLdooY`vzSM$)upS+W}PMli?*M{3Pucs|t1}=2o
zC+V(e$>r*QS<IZk+{<2We{H7m-|REs=kZ#*S^nvLwsHfv`nh(%V=2!;eQ3_vEQL<B
zzGHkSD~>|;p;PKN<ezem5!fK|>pSFyL-3R0Lx5f6aX)_Z_Pc`Wa#dc!BLF7DO?~$}
zEa#*wVat;7gt6&-W+E;jF`e`opvUlYKeGjN41GrK_oKCUUH;>lD=pp7k(ZtLV9{wj
z!^`KJ!FHQ11^+~g0M}XZayx2_p7Pz$-39^QMq?4y7@Y}rCWE1_fFZqo7R0^-bE(9*
zH*e$Q#HmcP*M9A7(E4+~;v|St+QTleh;hFX+))yXOB`ZS2E&tG?MB+de&s~I8h^L3
zxs>O>2dGw#cG&j?lXmx79j?k8TU#w9Wz9pCGWl-Lzjum4bxsDiC%`**Sk*ySqZ{jg
zJR`8CNi1Xv5(hO1Ku=nk*h96NyjE8aEhC-Mf%<iUWGy7P3N?czEZC=!uT4!a8nj~2
zV@y326XVLzD4=|lEEguu@2wG&)VU|m?rNaD&8m$q?wWMc<+mG2oR?cH(k^Rg=%tmH
zB0tisF@g)(Vx-6D6s<e$ywE{4l}$kr_Kg9rEHO5u7tmtPM4&R%NC!j$DWw@z0gpag
zt`*kni4YB6tj%c*UlL&sZv<F5to6s`_P#5^^?QbAjyyal7t0UOMvH%tALbRg22#!X
zFrDDWcb2q|fRlvCNkru5drS@annG2Pa}$0=2NCL6GG~&Afo>)f&@J8sv&#K}4gf7!
zg{gIIuXUn^LZEyUc)NW8Yjodo>+(sPQ~l+T3X4O>pL3a0p1a9%DU0uqe+p>@495&y
zRQI>wx*zo*<WI4lFbZf2IF{Ntg&fRQ>`iY`=--k%Yn~JR+8|BwSxL!lfZyPt_QOdR
z^T}fq=03VS-)iG8=hZQ|Yz<Vkua{XKe_gGS){DRQ8};t}Ph+z`j^uAS8G`ZyRH2Js
z*b#i(B*Q3aNQGa9xeEmrjryiBy!PltDI(QL{=sVp(fElp8J!>Soyy35de%I$`gmVL
zhYS1T_rBvJl|JQ%5(G`ZAf--E7V0-hksh749oTvdz^~6+o->m--m@p)TX9k9f}X1(
zeEZ?HpBL@brGUNGw#D!NXt$*suc5MXqgqHyNjdT4zLj7iRJ-#e>>}1sk*iqsxKf&N
zI&9sp5?Z75BsQ-U7+?0A$DRJp=KS@rHdMKe$ybrb`M7$DSAXGQre`E`us@dK_u}n(
zc02rD)mBr*U*p$psC8+}hOongz9PugU>uth7Xd2DiuHSJ(SBY({O7-dKoB)VtM}XH
z4&Gn-oO62v&cplW_sw`=RtB(4Ga}Lykhn%d9Mi;KF|^s9$@+87O<0rMG;`W9hs0(y
z3}?3Hc_I@+@QTEds&V9E)-6G*oDoMStzKFL_=LZdhpt3h4KH<Kf}6wJ8JYHEWJg=;
zHS~rRcK=zS7}=@Yt9)*D<T<E?V8DEZ-57(MP!!Tei+*~hr7+p7$^A;An>~<nazba4
zNwR6^m19@Pfr5(`!NOXnYO^fD2}IXk@Cb;NLcp%<4p03%093M_p$J1&2S#E1q-w1<
zDZN_pg1wLZXKC@wf`fRCU&W~=mx=-Fg3WH>fSUI>EM{}+$SYdV2l^z+$*6Lcg_xZ=
z_3Y;Di5u}x>_&WnBgo|vIx}%wg4iYvWPGw8zsz~RJ-02z$E-Ve>+0i{?B;!8ue;)V
zVxQFpKg!1Q;#ccaXbGN872+750@rHF!bKAba7=c(E%?f58(|9N#-m-WRo&(A*IkyI
zBg?Rvp*GtyxpNa`skiS^7$wj32lXS#qqnQA9-e-TXHMtaF2S-w_wD7`^p*sF)zZZ1
z%pdl$E;+tiJo(-V^tQ^uPK>vIUD;QeITLxm%FYXV#Jc#&h_7=wZ0bdp|C>~Gc&q1!
z_I{p@+$pKZ6QGU3zW74qE4(Z78w~+?vnE&&M!;>+AmNECw?1M_ghLjlJgO@#Gxj4X
z)BNdUiD@26uOcgB$D!CJ+V8brFrm%>ln<|*@^Si`yXNKBvmojop<IJdo|~}FGvL2U
z%nx&&ha@RH0-g1-a{(UqBKU_QaD|P`V@U}oPM*0^QjPk#3y^gfqtfiX+cXa1xwA9m
zT)DS(Bck5CX=W>SaTZ!795}GQ*jW$v%LBEycD-`l9-k3*rtwdkN*D1?r&Kg4JX7~E
zZYc%8{b^0QqjQ9qlAqfUH%?yB<nY4JAQM~MJxO?&5c!qbDlIHH9br*&8Xs?DWE#zQ
z`tlPbul@BtFU%fSLo~dut!uuQ?ySqD8-d=xmPU@$s?sBR5#{lho&84W+pONtx}La~
zJcgf0Dy$1~&jbXD{A+Wa#!imM;VzDac-2u%7qo~VD5irfm(Rt7(6t7j?RsS=Ym}N|
zc_Vb>F>6E24ixPMer>tuIcRVC%W>7toYD|f`#hfR`1Kv#-ekW{Pp%Wpus}H_u(FaJ
zij|~{V)5SI=4|ahI8B^M%OJzyBREBxHw)M%2%~X-3C89O{c_4OOf6b{B{vQSm4*?I
zKlc&3ll_Bn{)F&l{T^8+;eMf79gW|0EisLeF7Pb7x{>^d-~c|8fBm=3DtgPWPREtJ
zH=)tlTkgCg7B1G_{i5qFHcdq_E_D|SOCAUd+VU<Hr+pQ#*YQ1(0lfA8`nkRT{d4!J
z?dvHtSb$;Vp`G9pdVvq*QW)!yFtgwsu?h~&6cqTB>$Wg~c+FY#mb@CFDaqwnZh~u;
zOv~6fMx81lac}xIrg8i@1d>G@cesg)e`kc(ZGHjMF?ONb^nqoVINep;D(v-hT#Wa(
z0r-ni=QbqMKxRO1@EYG~0O$u-OAz^=3vdZd{%noUyMakcM;m<n?HhCRr#T#XA4Gcl
zOUi0x_4uuo6&K#?yn5#;j&!Lv+ju@@&hTkdEA2BKSgCruwU;E4A*xNj!i%(|`Y-nP
zE#DMe)`L8rD)v-4#VdVstY&}S&Z3mPH!k5r-W-R{ruhrSfH5xu)0@mB0Y2Xj1*a|(
zlY`tOv6&e0cg=RF((c3^0?D`MB44A!s2H4(_XnK2fuaR|M$!%cmu>>Y;SJ`^^E!kF
z@r!|dSJlS5B5D>1Bak(Of4`J?a>~|gPsc7@E$sjLiDECwU#eIeRJ1<lLKFg*h2VNN
zZOH6!i3%WivLs7wo-bVmKJ{(Q^XESKOWx~I$7cE-0>;PN2ahqT#*6dg@7M=4Mhab2
zQLyn)aI779YSkxGr-Jfm?M#ZcjYaG*nu20CW9ZX2ZR1_J6Ss(^g0{>-ZX&`wLkCx<
z9x!}PspKC1tW8Ks>=ht83gCq3f3O3;i_I4rI4122U`xZl-Yp9FxL);+qi+&)J}Ta{
z{!-H^FRz`mA6f2Juhr_`pLDI(FjDKS@dMjH9^&+T3;7g7NKs1<1^#7Ls<Iqg^^nc+
zgfDQna-LPg=7)5PRGJkJ`E(wTTyb%=<U+O6(R<a5(@r3Tvn2n%y0L@zXM1I*k5TTP
zO-GUZnXY{6K3tcB%&{kK+>5U_2*ojkRM0B-K^z`CGh&GoO?!%HZYF7KkGzhv$A_ca
z``NCwq*w3vTCdJ|ca=Ry`ly;d#=F#CidzA8<oDhrmHK!zQtbaFcI1uyd)B|cX`YTt
zb>8F8YEnW-Hd-<mZnWVObe11>^94Np_8!_+#0+wGc(2vTK<qPnEHA0a8RUA~9gN<m
z_BnJKMNb6Vd0k9vvB^OTBV{t~=$bRuP2eBx^02nEd^4u9?&vG*u2x)5MSjlUZkK~6
zk}si4RSWHR;aY-N96^C^l-m5QMC(gP2C5;V-|(HqJ*2_IMA>9`Uqmca!bH7!*`}ZU
zhvboHDOx-kIjoEd-2S$CF#Tu84SP=X=(MCqYKH@96Qy$4>$ct;W<W`gtdDw#Patm1
z#iT<x;0%Q4$e7tNrp<w_r<~oU%%c-hQrn#RJQ!FV0}MlWag3J48e^T{M3WDcq|+wP
z>TDI`%grGqcPG9zfQCP~Uo-<#4AW=+&qq4_wG1)^tFT+~*D?`9(|nm{21^Rd3QPUw
zL)3=$P~AjVq(n)%JLu9J-AZ0wZ6Xv=ISZM#j&HomWg^nj?A?o>oLcCO@))>82u+sS
z_^0_V37f23;6b*`o%$To%TXi7v8vXC#o%#DPF%xpa4OZ#8)J3`g?`N~Upzy$I&P9m
z+m=4x!L~EOa&W(o@W9|wLr&Y8@C@88cBDkC6%<mg)!Cd^av1taE;d){!YusMgfi^;
zvaaNvyw^vAF#e~x?|^D5+xj0xdXpzrnux#%1d!et3q@%vz4zXGAe0GRIwC!QD9A{F
z&_eG>lMd1$A%r5GfP@yvht9lt<D2=u_160T-&(WwZ|(g%`{bN+bMDDL_nxeCFX=0@
zwn|1Xe7G#^KDj>F?8^)-vsb`wOOb-iA+hVO1oEk`OqiWJV1ST=2uB5sPI_kBm->)I
zs=&UPckiKXkz@>H<gU~}#Ei}XpY0$tS4V0M0b1Kr6k!m!n^$4qKJf8ly>+gUMJ_Au
ztoMFdiLwf@#v|K`QFC{xr+5y-;Gco;`?S%r5ij=HYse^5-|p7=2X0UVHJAEze8KoL
zJt6989-qz<<ApwMekmsHv>~a^O(y@5DPupxH<2kqE<SN=tOjeafX5nmjM&M{+zfz8
zkiTE8u$6;KBt1}2;i>$YqoYsDvOG*%;;~JY5GeSG2Dl@4xIa(Sqn+3)3cnU^UN9{F
zxk|CIHNk#WKS3nAcO)bvr&nry1VpZOFnna=bVR%OtP=#zZXoX~y~b@4(#lr#qZu+!
z33#z~o=V}ZeDa~(Ry?dsigYDn$(fYY8dbqBOdh&;?F!Hey;N|mkBKJK*3F#za+mAQ
zJ@;mn<IM|O5fu#Jl}XM^5#49d;9Icz=C>k#apVcCyfVVI;^Lg1x~c5@(^5(7Yfo;G
zE0u60pqo6z8|8+$x)jsgCLE2Iy<_%9tNS09F$jh%Af1(xTW6thI!c{QpNcna@=l<S
zwXrvdH^B(i(81RM(F2s;?Ob)sA#Sb(drBS`_=EW;MDLV#n?+x1#bsUoyDxGkw&k_1
zqpRskQGiKGpj?<$JLujZWR?)nug*Pr6M*jC=wfAt2MN&;W>Oitar>pWQ9O|CtXe*;
z1D^p2sn(9z?Uqs$WSj4t)81ELc2Gb(r5H|f(lHp=Yhsk+9fb@f<Lo_dqBAyQMy=&H
zE?TSxEL&1?;X=p6c7WU0UX}q$JfI!yMZPJ0)m6b4vduli<w<J07%SQlh5B~QFIagh
zGxtTT{6LMsL{zJbQCY4Y$b%bn-~<yBeu2_t#@s)otgI<$A)ogxAGG+KJ3{ixHQ|Lt
zj>FxbTXUB8DIXSmT0h{_gaEo<<yykCBI>-Ku_O$DYb`dUPQ0(Y%2wT|m|9?T5XvcF
zpFMtQV3zxj@Tj;~7f*_A1t@k%wsT=%uB9`w4htr0X4>_Au{c7nF;|R5)afEL{)D;e
zBRlWRsi&-n8~`WJS%l(q+iKk%jVZJ3)~T&bFs3kl>Vw>RxrB=HYeOcHEAGI!$glH_
z;IHH(COj|q=mBQ|bB~=_rZU?wLl(jrqaWOFN)6tZz82HNtwd{X^rj)}o@aS!SB+(|
zW1sq%(hr<GoIej;2~;V4S(|yK$?5$&Y`m$x>+5veSm`?(lvobC1)m`gNmwu=$uT<r
z%f{v@0<SXxg~h-Px9#Aw?f75Lx6HVYrW_kDPLNItu<eD%1V`Jltc*@P8J3Y!^x(!X
z$U?lpx!-!LD&FLDcPu3R0<Q}y#IChP%zB$MfWV0nk_X^3U+guFnSac^G>>6g)nA;-
zUqi#2;XDLKDDCJyU}=RHw@}CW$N^?HRwjg6HcokuacJ?e^X@!3q*K58n%00&&(-16
z!{<1o+w<KrK!$X8COvn$DR)*0_Zz$Du$)eCP>;eVwg{}?L*KlKjs4R8S^;E3;O75d
zvLL(w7+>HRckK6;oLxxpt$n+&ZSN=Z8)Z#6Fm*{J0X>@L>|mq8Mwcsx%iZ3hvG~n}
zm>uqHS}>Z6NQ{_2B4XAgn)Hy^X*b*DCzPiVo;AvDE5aB+Dt9@yyN6QSRB-D#3dHiQ
z2S4s9;z5jwi}xVyDZqd=i^Wa28DWb}Ka*?}`;zkUz2MNir8OX%;G$wvcp+!~mP*;8
zPE+I*h6wS&2-^_vw<jQg5-wZhEkjAWE^@n~gGy{W5JES2sp2-Cg2K_|D-tMP4?%Y_
zW(ycHJh?=&S%ie2Ade)7jZj>u!<Mm@=Rsa8aT=JzclyG*Zb(~AsEfjj|7u>bT+0Cr
z>{C(()FkXby2|5jCRtMyx><bA&qjgCBWu-%hd|E*Gnh3ATPM;wf!7jI{ijW#u$>a(
z+%_h>3^eF@V`0#f>hXkaF%aB?YVCYC^a6%90uovE<o!BAq~sJnB<@+^t|@d4V=9pi
zp?a8`rajES8*b|%%)5&w#vOtzC+WvJ8FQKuPG>3L{);1K1DHK*>1G+4$aSgqc3>0|
zO+9_sD%Zp_TZ0W^5t5;T2=Q@;j^AI@p7!ft$rkG29(Y4qW#2K7DdfdH03j8z`;Ary
zSzOGMm!M6JunrOr^MW`u;9TvrA_Em|Rj1VMERuJJ3j8G<*fb(DCen)Fd0k-~<B#n=
zTG#E%k~xPraX%EG%Rbd4mPxS))(tZK@b&9&c&VM)Z0qgm$bv;K{B+L>d{xh0VI2Y~
z=YsvH7&@ArpYNo2=Dj*AnCDrMzkBq!%45tKBFfA&*!?^0OfCJ0xoY}BRsSQVQeJP5
z*R*pJNZ_^vX!`XmGbC)N;)<~_uo=1%f8LFy+txAe^qFr{$I-WT?qZ0yZf3F}Zn(^0
z9m{s8kKPs$_@S)uXF_`z_m-{8bj-xLee2oig}cHj{~jqweR2GlUw7)4a|>5(4=M)<
z-wQ^@8K|M+7WF}XOvpb6<jpzDAyg=d8;VKR?kwt<CO9r{vFO-e2##!aXa$W2AH6%@
zQ9mn{#u5uoxGntq54SO)IBG8Vyk(o(*AX1V!Z@6dCF!x~7lHS5W+-Su(TMA)%-N7g
z&OmNRklj`4$chl|xQ(}MN*Q#+pKd#E92f;6@Ga3%7!tNlCfOGi$E5EvED{KFDfPDO
z9ND9BX2-~51)u?h4@d_?`80tgF!YFjKZIR$+i@HLb)5jKJ3wyHFrW?o<!9*UD}0#*
zWp2dA0O|&DwoiET&v+rBjtxiuk<;zh@EL93)eNdY*%EM(V=Kkmdvs+LIv_vydpdJr
ztyCa&|CS6-0W~RxcgI<tN@`M^?;tc<!8W{-0n&SlU*p;@xjofplX$v7v63tAIu6U1
z;_x{W^6wYM<l$O!a}cVjH}Bo$N)n2;?bqB*hY6JrPlvL>ZhfCMYapY+GIhE8)}kwY
z_8(J5U-7)XtEr@w8~3gQsM`u08V!zSNA(<&2FK)~ZCZl~VW(YA!I%bn3Fp=qwR_@-
z_Qtw!Gsbv944-dH+4(*98GJDM7u{+-56USI0tt*!>ltfsqJsI<<xPFA{agaRrTJnb
z10P9^3t%T!0{$Y`Q2|hhInZL9c(_v(HGf2%Nf0%kO;s<!>gguEjPUMlUQYsPaSk+#
zfPLnfbq^^w@sWoioh(j3GW$z}OJNh+c!N7}ZgmIZj)LJ#2zR_o9bSAsgxR7+M=sH!
zwP4r-C)eV5Mha;+kbMD=jVL+{Q3siV?k`WVc7BZv26w(qI6(0MR3uNrU*MqOnbDWV
zbk<I~rkJTcX+&E#klYQ;+7zpLtW(z`rv1asou+u9M&94UVQ?%Gb#zSN8{e0P-f}=z
z1<hfQQ*7?iRB_XZ(}|(yAaLq=^#7CmI1M}f^|1A4F01@6h@0oaazmeI%8G3{?nier
zY6}8R$Yjwsr%%cz_tc;{)?$$qQepFJ(1Dxhuh+va(Pt$xFIX&ZSB<24`^mbvPdnv3
zx0d?5EH$xAM?(dP(!A`+VfD>5?l5(wtT<672jMa6f<Bd$WNywu^8)Fie?=Evfp49N
zxM48|Lrxti<L=@ny(Q09p)s^ORC7h0tgTCkuX9<x9C+f!X*KBl65j6G6^8L@MwiG}
zkD{A>+qTxpY9S3tok(K{+gvv<UZRmL9=^Ao{>7iktQ~y}3Y<uWv@xCA!8ILgt2Iwb
zHz;zbG!)34=Y*pss&L+tn$T@G2mIr+IA8t;p?7UFtiX1D@+7i6NNNlxj!~gq6XRv<
zy_|l2`mdp(Do~4|LUeKA9#jirptIxP35rZAk%CjC8w)B1``d&W%(uC_2f|&cebmA;
zRD*7X;oC|W(TVwMZk_%|Lgf^J8g!>pI-l3H^YgSKf=v}yPJ}L~3D!E`rx8Lu7i{`H
zzQ;(0(Bv5Mi`rPZ!0T~M*K=8UslKo~Cc3lKu+Zb}xATgnw9owY8CXlVJIp@GlLVId
z-YzeuW6|N0G(3X?S`S)7+60|XKAM_E@h3$3XiV&&+e{yB)9AuO(^*bbIo>LB97ODe
z??35nuoT<_W^7XvKxfe&@E){dV$TFyB2<n|4<yUBdKoxte0^M`*j69IcmLH3{ieV6
zf^j#UahI5J59R!aGkudQ!EUl<sSD6bnf#y!pvXq19b4x-l<PNAm;D_v7`0W*rgPD)
z{wrdLy1UPQd6|$)Y_vlH@C#3qdB8V)rn7i&`!Zk`Jp#%s&+G?I{TZHzuJr-6#?3}$
z2!P&h8lP`JykW&~!L!u0Ubog5YE(7>m_q4h_)Nf#JZ{B)oi=K4w6jH$(l$d7&pc_H
zd5tKMEj_THBYQWez79kKL@&Q>a9nMN8ef7?>Gei|T_BxPoh<Sujr_C!>I+rK9FTZ-
z=^p}Uva)|(Mg*VB;MhXiHco1{`CVmV=Z0W4YIDLa{ndb;8kRXvXPMSnTfMm^$4h&e
zbpYMQ{Z0X}nx@%($A0Lai3@k_;4&7!CY+?`!<Csb1!-Dk*@mDYRa21W)h~JDA*PcD
zmAUDMO(knKa)O)w%JRFtYpf?toOyoB2MK|Q<YAfpKRT<);b!4T6Ox`xqDhQjjqGj+
z6gnUJJs$LKT9_N*r69E{)Jw)SD`ci!PC!<-MfE1GS(m0TKM&G$55j-W2J%$P!c>7K
zgUghD6%zAZ2zLfhr^%N3Zasp+DH{Z)(TEaj%SIuN?r&?NLdM%{>w;TK*X9sfO{}MZ
z^!h{>UD(!e5(o3}aT!gbG;oE4<#!;nF1gAC;-oj?>6z@S@bPrcVYy5}<+>5kT?yh?
zCH_^uKT3^nO#EYKN*1H@?#bo~A2;U(W}~CuDO9?<IH980s$_%lvJw%t|3r*1-Az50
zjeQTUxI2FXDTw<!h;`iGL6+nG4niCEcM!;-SciexO~_$k`}ao5tO=s!AX_vB9I7Q-
z`@}r_ezBQzR_4ujsxhDiy7rwaS_1{N{860+w7}N>sB(`4R-63pt?Bd+gBZLJjTr}s
zF34}b=Gc037&*4#PbwDMU=RDVvWBT*8~&u8cU5Xv@ayoa()IrrXij!vjLmyXgJS(O
z-n73Xoxv2|?@1?OHM{8@=rDpYeUDZROQ@yzEq#wqx<&MJ-I%XznBTwQ>!-gf`WK0*
zu>>cF9(Xm{aMlB`U6<x-tSXaxxuN(!z-6<?W9HA|T`w_uaQ4P<{LRg-e`4Xy&F^4C
zSJdyQo~{!HoA&HV<Et@-uM`9HT<UH6#f-{kJQvb7Ym94GA^{T4^%nh8E!M}<I3pOK
z-_n4-zfwP~tCBy>rh-4##(@71t`-^;vrimdvfd-piXg@1Z-mDGd!lGW=b}@sGphSn
z<c5oSwb<z7Bcs0}Ce=QplZr+RE`LQRN5vn_U3Ym{{g*^>j@Cu1T76XfFUV%GpU*^N
z!-k2;VOg11t5fO({Nsk9jZbN1gRX%Iw4^LRZz|b)Fy+$fHA6R>cBEmALz`s>4Zl;d
z=TkS|JH>y3D{UBZ`jjR&OsbeT6_owa&H8H-MoP~8(JoR$0L~hl4>fVqX*6@fmcKfg
zD!w@bluGPA{O>BE;Qz|~zsr8jtto~785bLFWEYXt9i~y2ON45~x*-vmTXEgb7cFE%
zd)$dMmmK7*&bWWQiSu21v<LwGX-VL6EiY*|%v?$qZ)A2@3On^&k220BFY#ROFBD8~
zF}_THBmAe8pZnhk#<u(iBsimD0z=JmqS9zcN`X7?XhRB8;7WVikOAL}UKW9fuX#7s
zz%-aiM#zfTcB}0ulK^Q)h1>3IL&{V9o4G8gmrhXSZJtIoFa|b|7E&d)U2o%O%_#id
znHxZKF=@5vZ@1_s7a2%7*vw(}u;r4R+}syicIurPnP;vPw|42BO@ebcJ)Ddzp)~m4
z9r^VVqDM-rh~9bTJ{#+u_+{aj{VD>S^>M!ugE;GZFS}IeIsX&l<#t)aKyz}vg!obS
zDq?z`IU8i<<>tH-KiFLHUvRQF-#8hSNzQ9JJMQ~xZk)Ui;Mot^Ph=jvT+4>*HoGz_
zUuSz>v!uYJvUp2r(em}}iXUQ5?{3GuQQ0&<{c%r&M*B`1#`Q74yGdqOK>dJp?2ZZB
zZH-JG6{cH3S+5+PFLMaX)GEhRrhbS}{4Cihqks$)k&*oYsDF0V@##g78EAR==KTBf
zrDf?r?X%84r*Z?N=RRef7Q6Hb_dGOYbJ?fP1V7qWyNEvB)o39<nwrcBq?R|@l=Qa(
z)E^Y4>~;=yBWVkL(c<7^2&Z8^5w)X&R6W&^Q>&CeC6!Z%^a+vdFGrBT8*Gz28m3X2
z8w!#q^eFsHpC9VkxgZZRY<0Fs1EG)i*>>VVM!AW%gb6Gsfv;RsAB!$vdi46I5shqL
zvW)R39gIT;o0R9fodR2<H`=X?uDl=DEpW@D*?xkZFGykQyXRm-`|zg+GFmThyrk=k
zl%2B&RK}~oj7w)l?brAwr-opPqjy*)6@<kfVl~a9<V7w-`{u^1Qas|<MNKdz4n@lT
z)%gVS*S^gA=H_SH5&6gqSE-OXuXP#sVd~o@>RKCX6HRR&J((-+)v>nD6|3N}N_I$I
z6jcp>;3ZJ5^XOhseF{-9*DG$5dAA*Ln&J4nxm#NUwpF$tVg`-l{l=af?0#wT?V*;Q
zE1(D$;%cJtq93X4qTbeiL>BfVr~gkqR&T^@xEP}`qVX#FfU!A^y%?^JD}66@YqUX+
z2o?Qi1UmA)5{b1kx$A1rLav(vP;58U)9Cm>gE|UO(<eOm1+P6_hs7sRTb`ebIonb#
z{1Vskek;H$8hVSmgI44^BA=*dj!6<3*u-J_E*<o;h38TRYU`i}7i(W~MrVb{27M<@
zJ&EJ$5WbpiPFU^ocgxZDX4LI_Oj)zN2C_s94XFFobe~N_{e21VQ#~9@fFOHM1m<Tx
z8=Cd5oC`55EXi_|zJl{J`{J6HWnLREM8=JD--RHfu}`|UN;B^TcS&2-@NQFV>+%l)
zlWv;E*H@-{@t2YZtnS5NZzxqQqhE;$)a}st(Ri|V8-r_@(c&FRN!d>42G>q==xstA
zHdwuL=rLX?(xQtN>`Bf=VJ34rVIKb1J7~VV=uDadWbqILoK|C_?VRR{SedId8>5_2
z6~?(fC-ldk03^ffA2viK71sCl%0$RlYf7GH<{NvzvuQ$2*VKAH+2oqisa=KeRd$6R
zrG>pkdFEENG^1mtBAW%Rx=V8E99Laq($1MZedRvR1sq8Ay9~WoWtrZ!^TviY3R$!A
zQAcNU_87!6V(auCS{779&#tiMF;N0dDreu|t!(9%FXTDq=<`@oWMA9mot^Iol>{%j
zAPZ&H*2;Fp6364#)F)7!QEk{Hl%rb4%*zFv#I&P_n0Q@TJ_^61N=r_OAm08lH~;>v
zJBHgmI=lVMPY**r1Q&%X85ct=H5phcKJ~u0q|36l@k|ZWUa%2~oiXGep^ptbv?SW}
zQ``4UXpy@@kV`l<43C-HF!p*BYxyB-C9v=KXl95WDzYl$VkPM0&N>tW^*d~AS!Gyv
zq~8k`6hEHkb#8b&SXv}GTqOBoHDiUS$S{fEy~iCb@RAQdS(tFAWFGDNxJvy+wJa~H
zC1X*{fK+c3_w9w~YI4JP0VfM<1UjPl1&;x5wG!9m!^7XqM|#DPg<e;Fcr{H)WPnb|
zitF>hGX0X;W6mm%PQ?QBgB6(dZBex3-~^$3Lgh8Wh<8Vc13yYZvibwYKCfKC6xJrG
z#0t+l6MiPl29A(5y#^PV0zWB`VyeX$t8pWn*QVLc8+X|Q@~4g*Cc4r>B8TPh<={|~
zw++!#5tVnJ{p8R``#8+JXI<3dQ`%&pqfqJ%hvVj7?kBIQ?AG#rjH7jCS~IxKl(i!9
zrNguc9E?O_aXW1Xc|NAzxN@+dbQqR~!-*9rCn)QrKVHUgnscj7;JypW!|8g!c8aOf
z&pkY0=-`pNoA$_eKDja88uOc>S0Ae$N3-1NAQ4MuYPV5(&&DhGDlV>9vVsPlD0jz%
zH}g}1a?ucBIZoM7lP5Gq>$#bIV{*@=`g3sxRJk`PovI^?r_pqsq1UWVidLe)O`+?S
zg;V^7jgt}4D=OWe1ZRLZ;|UWE^d5K+r3V>mt0E2yW3?lGrvBn-)vTeyjzGIYvLBP-
ze>eg?6}x<1{;0Au<qtn}V~|c}6UEI(hz<BB(?T(*?Y6pVd`rOL7E|{1+o(q+<S*nn
zyRTH}Ig{GSU{n90j9>2eJ4Uu>#<k);CZj`S1=W61yQNg}T2k=?Uvb9LlOONizgw94
zOjl|}=jk)9RGnu!ViOZjwE*ymXL@pnVk1vE<HatwI1R!_p1;w3@bZpRX*{h9eB6|n
z)o09r!Nh0Wq?j$>NlIBd;`B2#??RX&$>H^VB4*29EGj7^I#k}qiFfOx<0RT2rChDR
z8o9*B`U0&=0pc?&uL;1f<4p~18euIn&P9i1!0p%tsuNUW9#(4W-DX0Db4=;G2EZI;
z?Yv))$x#zvem9wzP1-SQxW<2@g6AD*_bsJuuh_VA)$$Cdb3z~u;hWVgyB0rsee3+L
zG{YrGbDEKDM5_Gpa+6(xl<9FdpCH72jLFW#=cB_^iC3Qu!&MLPZSb+Vt*(+%ps1h(
z?GwuL&FXN7yXZ^(>x07y%aNSzU+nMTl(~3#3UNe{Z7vqy9wdA9@;wJv@%YQPBwW50
W;j3pr?#=KwYa<ByYKOXW8vX}yqTI6p

diff --git a/browser/base/content/fonts/FiraSans-Light.woff b/browser/base/content/fonts/FiraSans-Light.woff
deleted file mode 100644
index 979d0a5018299955cebb5378c941f72c907769cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26440
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

diff --git a/browser/base/content/fonts/FiraSans-Regular.woff b/browser/base/content/fonts/FiraSans-Regular.woff
deleted file mode 100644
index 15605473f77ac5371ca3757e2a13a0e7c1427e5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26228
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

diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index daf6ffbd401..1a7c51e928d 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -78,9 +78,6 @@ browser.jar:
 *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
 *       content/browser/chatWindow.xul                (content/chatWindow.xul)
         content/browser/content.js                    (content/content.js)
-        content/browser/fonts/ClearSans-Regular.woff  (content/fonts/ClearSans-Regular.woff)
-        content/browser/fonts/FiraSans-Regular.woff   (content/fonts/FiraSans-Regular.woff)
-        content/browser/fonts/FiraSans-Light.woff     (content/fonts/FiraSans-Light.woff)
         content/browser/newtab/newTab.xul             (content/newtab/newTab.xul)
 *       content/browser/newtab/newTab.js              (content/newtab/newTab.js)
         content/browser/newtab/newTab.css             (content/newtab/newTab.css)

From ccaf87855b11cd22a3b4afe5b3840cafd5313422 Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Thu, 5 Jun 2014 17:03:00 +0200
Subject: [PATCH 013/103] Bug 1018955 - Fix pause/resume button flicker when
 debugger first loads. r=fitzgen

---
 browser/devtools/debugger/debugger-controller.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/browser/devtools/debugger/debugger-controller.js b/browser/devtools/debugger/debugger-controller.js
index 8205d27b08a..498c7ef2011 100644
--- a/browser/devtools/debugger/debugger-controller.js
+++ b/browser/devtools/debugger/debugger-controller.js
@@ -444,7 +444,6 @@ ThreadState.prototype = {
     this.activeThread.addListener("resumed", this._update);
     this.activeThread.pauseOnExceptions(Prefs.pauseOnExceptions,
                                         Prefs.ignoreCaughtExceptions);
-    this.handleTabNavigation();
   },
 
   /**

From 7622da763ab0fee5b65a9502836f88e9f3945a16 Mon Sep 17 00:00:00 2001
From: Axel Hecht <l10n@mozilla.com>
Date: Fri, 30 May 2014 08:46:00 +0200
Subject: [PATCH 014/103] Bug 1018257 - drop metro from Firefox localization.
 r=gavin f=flod

---
 browser/locales/filter.py | 10 +++-------
 browser/locales/l10n.ini  |  1 -
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/browser/locales/filter.py b/browser/locales/filter.py
index f153141fac2..25ddf470eb7 100755
--- a/browser/locales/filter.py
+++ b/browser/locales/filter.py
@@ -6,14 +6,14 @@ def test(mod, path, entity = None):
   import re
   # ignore anything but Firefox
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
-                 "browser", "browser/metro", "webapprt",
+                 "browser", "webapprt",
                  "extensions/reporter", "extensions/spellcheck",
                  "other-licenses/branding/firefox",
                  "browser/branding/official",
                  "services/sync"):
     return "ignore"
-  if mod not in ("browser", "browser/metro", "extensions/spellcheck"):
-    # we only have exceptions for browser, metro and extensions/spellcheck
+  if mod not in ("browser", "extensions/spellcheck"):
+    # we only have exceptions for browser and extensions/spellcheck
     return "error"
   if not entity:
     # the only files to ignore are spell checkers and search
@@ -35,8 +35,4 @@ def test(mod, path, entity = None):
                 re.match(r"gecko\.handlerService\.schemes\.", entity) or
                 re.match(r"gecko\.handlerService\.defaultHandlersVersion", entity))
             else "error")
-  if mod == "browser/metro" and path == "chrome/region.properties":
-      return ("ignore"
-              if re.match(r"browser\.search\.order\.[1-9]", entity)
-              else "error")
   return "error"
diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini
index 3a01b9677c7..5056b5ddc46 100644
--- a/browser/locales/l10n.ini
+++ b/browser/locales/l10n.ini
@@ -8,7 +8,6 @@ all = browser/locales/all-locales
 
 [compare]
 dirs = browser
-     browser/metro
      extensions/reporter
      other-licenses/branding/firefox
      browser/branding/official

From 6cd5bee13dfdad6d51bf3d3227a89f7d470983d4 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 4 Jun 2014 17:37:54 +0100
Subject: [PATCH 015/103] Bug 761566 - add per-OS settings/options/preferences
 string, r=mak

---
 browser/base/content/abouthome/aboutHome.xhtml     | 6 +++++-
 browser/base/jar.mn                                | 2 +-
 browser/locales/en-US/chrome/browser/aboutHome.dtd | 7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml
index 0e6c8fa59ce..3051452264b 100644
--- a/browser/base/content/abouthome/aboutHome.xhtml
+++ b/browser/base/content/abouthome/aboutHome.xhtml
@@ -62,7 +62,11 @@
       <button class="launchButton" id="apps" hidden="true">&abouthome.appsButton.label;</button>
       <button class="launchButton" id="addons">&abouthome.addonsButton.label;</button>
       <button class="launchButton" id="sync">&abouthome.syncButton.label;</button>
-      <button class="launchButton" id="settings">&abouthome.settingsButton.label;</button>
+#ifdef XP_WIN
+      <button class="launchButton" id="settings">&abouthome.preferencesButtonWin.label;</button>
+#else
+      <button class="launchButton" id="settings">&abouthome.preferencesButtonUnix.label;</button>
+#endif
       <div id="restorePreviousSessionSeparator"/>
       <button class="launchButton" id="restorePreviousSession">&historyRestoreLastSession.label;</button>
     </div>
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 1a7c51e928d..ea01ce530e5 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -18,7 +18,7 @@ browser.jar:
 *       content/browser/aboutDialog.js                (content/aboutDialog.js)
         content/browser/aboutDialog.css               (content/aboutDialog.css)
         content/browser/aboutRobots.xhtml             (content/aboutRobots.xhtml)
-        content/browser/abouthome/aboutHome.xhtml     (content/abouthome/aboutHome.xhtml)
+*       content/browser/abouthome/aboutHome.xhtml     (content/abouthome/aboutHome.xhtml)
         content/browser/abouthome/aboutHome.js        (content/abouthome/aboutHome.js)
 *       content/browser/abouthome/aboutHome.css       (content/abouthome/aboutHome.css)
         content/browser/abouthome/snippet1.png        (content/abouthome/snippet1.png)
diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd
index e84341f5400..7d25bebf997 100644
--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd
@@ -26,7 +26,12 @@
 
 <!ENTITY abouthome.bookmarksButton.label "Bookmarks">
 <!ENTITY abouthome.historyButton.label   "History">
-<!ENTITY abouthome.settingsButton.label  "Settings">
+<!-- LOCALIZATION NOTE (abouthome.preferencesButtonWin.label): The label for the
+     preferences/options item on about:home on Windows -->
+<!ENTITY abouthome.preferencesButtonWin.label  "Options">
+<!-- LOCALIZATION NOTE (abouthome.preferencesButtonUnix.label): The label for the
+     preferences/options item on about:home on Linux and OS X -->
+<!ENTITY abouthome.preferencesButtonUnix.label  "Preferences">
 <!ENTITY abouthome.addonsButton.label    "Add-ons">
 <!ENTITY abouthome.appsButton.label      "Marketplace">
 <!ENTITY abouthome.downloadsButton.label "Downloads">

From 9dddfe29e92c96a8944b49abc35ad16418ba0c73 Mon Sep 17 00:00:00 2001
From: Connor Brem <cbrem@mozilla.com>
Date: Thu, 5 Jun 2014 16:12:00 -0400
Subject: [PATCH 016/103] Bug 1005909 - Make URLs in console strings clickable.
 r=rcampbell

---
 browser/devtools/webconsole/console-output.js | 125 ++++++++++++++++++
 browser/devtools/webconsole/test/browser.ini  |   1 +
 .../test/browser_webconsole_clickable_urls.js |  83 ++++++++++++
 .../test/browser_webconsole_output_03.js      |   2 +
 .../test/browser_webconsole_output_04.js      |  13 +-
 browser/devtools/webconsole/test/head.js      |  84 +++++++++---
 6 files changed, 285 insertions(+), 23 deletions(-)
 create mode 100644 browser/devtools/webconsole/test/browser_webconsole_clickable_urls.js

diff --git a/browser/devtools/webconsole/console-output.js b/browser/devtools/webconsole/console-output.js
index b14e22ae797..e5f3d7c1616 100644
--- a/browser/devtools/webconsole/console-output.js
+++ b/browser/devtools/webconsole/console-output.js
@@ -13,6 +13,7 @@ loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.j
 loader.lazyImporter(this, "Task","resource://gre/modules/Task.jsm");
 
 const Heritage = require("sdk/core/heritage");
+const URI = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
 const XHTML_NS = "http://www.w3.org/1999/xhtml";
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 const STRINGS_URI = "chrome://browser/locale/devtools/webconsole.properties";
@@ -1081,6 +1082,11 @@ Messages.Extended.prototype = Heritage.extend(Messages.Simple.prototype,
 
     let result = this.document.createElementNS(XHTML_NS, "span");
     if (isPrimitive) {
+      if (Widgets.URLString.prototype.containsURL.call(Widgets.URLString.prototype, grip)) {
+        let widget = new Widgets.URLString(this, grip, options).render();
+        return widget.element;
+      }
+
       let className = this.getClassNameForValueGrip(grip);
       if (className) {
         result.className = className;
@@ -1757,6 +1763,125 @@ Widgets.MessageTimestamp.prototype = Heritage.extend(Widgets.BaseWidget.prototyp
 }); // Widgets.MessageTimestamp.prototype
 
 
+/**
+ * The URLString widget, for rendering strings where at least one token is a
+ * URL.
+ *
+ * @constructor
+ * @param object message
+ *        The owning message.
+ * @param string str
+ *        The string, which contains at least one valid URL.
+ */
+Widgets.URLString = function(message, str)
+{
+  Widgets.BaseWidget.call(this, message);
+  this.str = str;
+};
+
+Widgets.URLString.prototype = Heritage.extend(Widgets.BaseWidget.prototype,
+{
+  /**
+   * The string to format, which contains at least one valid URL.
+   * @type string
+   */
+  str: "",
+
+  render: function()
+  {
+    if (this.element) {
+      return this;
+    }
+
+    // The rendered URLString will be a <span> containing a number of text
+    // <spans> for non-URL tokens and <a>'s for URL tokens.
+    this.element = this.el("span", {
+      class: "console-string"
+    });
+    this.element.appendChild(this._renderText("\""));
+
+    // As we walk through the tokens of the source string, we make sure to preserve
+    // the original whitespace that seperated the tokens.
+    let tokens = this.str.split(/\s+/);
+    let textStart = 0;
+    let tokenStart;
+    for (let token of tokens) {
+      tokenStart = this.str.indexOf(token, textStart);
+      if (this._isURL(token)) {
+        this.element.appendChild(this._renderText(this.str.slice(textStart, tokenStart)));
+        textStart = tokenStart + token.length;
+        this.element.appendChild(this._renderURL(token));
+      }
+    }
+
+    // Clean up any non-URL text at the end of the source string.
+    this.element.appendChild(this._renderText(this.str.slice(textStart, this.str.length)));
+    this.element.appendChild(this._renderText("\""));
+
+    return this;
+  },
+
+  /**
+   * Determines whether a grip is a string containing a URL.
+   *
+   * @param string grip
+   *        The grip, which may contain a URL.
+   * @return boolean
+   *         Whether the grip is a string containing a URL.
+   */
+  containsURL: function(grip)
+  {
+    if (typeof grip != "string") {
+      return false;
+    }
+
+    let tokens = grip.split(/\s+/);
+    return tokens.some(this._isURL);
+  },
+
+  /**
+   * Determines whether a string token is a valid URL.
+   *
+   * @param string token
+   *        The token.
+   * @return boolean
+   *         Whenther the token is a URL.
+   */
+  _isURL: function(token) {
+    try {
+      let uri = URI.newURI(token, null, null);
+      let url = uri.QueryInterface(Ci.nsIURL);
+      return true;
+    } catch (e) {
+      return false;
+    }
+  },
+
+  /**
+   * Renders a string as a URL.
+   *
+   * @param string url
+   *        The string to be rendered as a url.
+   * @return DOMElement
+   *         An element containing the rendered string.
+   */
+  _renderURL: function(url)
+  {
+    let result = this.el("a", {
+      class: "url",
+      title: url,
+      href: url,
+      draggable: false
+    }, url);
+    this.message._addLinkCallback(result);
+    return result;
+  },
+
+  _renderText: function(text) {
+    return this.el("span", text);
+  },
+}); // Widgets.URLString.prototype
+
 /**
  * Widget used for displaying ObjectActors that have no specialised renderers.
  *
diff --git a/browser/devtools/webconsole/test/browser.ini b/browser/devtools/webconsole/test/browser.ini
index b87dd998474..6e5aadb5b8a 100644
--- a/browser/devtools/webconsole/test/browser.ini
+++ b/browser/devtools/webconsole/test/browser.ini
@@ -245,6 +245,7 @@ run-if = os == "mac"
 [browser_webconsole_cached_autocomplete.js]
 [browser_webconsole_change_font_size.js]
 [browser_webconsole_chrome.js]
+[browser_webconsole_clickable_urls.js]
 [browser_webconsole_closure_inspection.js]
 [browser_webconsole_completion.js]
 [browser_webconsole_console_extras.js]
diff --git a/browser/devtools/webconsole/test/browser_webconsole_clickable_urls.js b/browser/devtools/webconsole/test/browser_webconsole_clickable_urls.js
new file mode 100644
index 00000000000..ebfbe5329d2
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_webconsole_clickable_urls.js
@@ -0,0 +1,83 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// When strings containing URLs are entered into the webconsole,
+// check its output and ensure that the output can be clicked to open those URLs.
+
+const TEST_URI = "data:text/html;charset=utf8,Bug 1005909 - Clickable URLS";
+
+let inputTests = [
+
+  // 0: URL opens page when clicked.
+  {
+    input: "'http://example.com'",
+    output: "http://example.com",
+    expectedTab: "http://example.com/",
+  },
+
+  // 1: URL opens page using https when clicked.
+  {
+    input: "'https://example.com'",
+    output: "https://example.com",
+    expectedTab: "https://example.com/",
+  },
+
+  // 2: URL with port opens page when clicked.
+  {
+    input: "'https://example.com:443'",
+    output: "https://example.com:443",
+    expectedTab: "https://example.com/",
+  },
+
+  // 3: URL containing non-empty path opens page when clicked.
+  {
+    input: "'http://example.com/foo'",
+    output: "http://example.com/foo",
+    expectedTab: "http://example.com/foo",
+  },
+
+  // 4: URL opens page when clicked, even when surrounded by non-URL tokens.
+  {
+  	input: "'foo http://example.com bar'",
+  	output: "foo http://example.com bar",
+  	expectedTab: "http://example.com/",
+  },
+
+  // 5: URL opens page when clicked, and whitespace is be preserved.
+  {
+  	input: "'foo\\nhttp://example.com\\nbar'",
+  	output: "foo\nhttp://example.com\nbar",
+  	expectedTab: "http://example.com/",
+  },
+
+  // 6: URL opens page when clicked when multiple links are present.
+  {
+  	input: "'http://example.com http://example.com'",
+  	output: "http://example.com http://example.com",
+  	expectedTab: "http://example.com/",
+  },
+
+  // 7: URL without scheme does not open page when clicked.
+  {
+    input: "'example.com'",
+    output: "example.com",
+  },
+
+  // 8: URL with invalid scheme does not open page when clicked.
+  {
+    input: "'foo://example.com'",
+    output: "foo://example.com",
+  },
+
+];
+
+function test() {
+  Task.spawn(function*() {
+    let {tab} = yield loadTab(TEST_URI);
+    let hud = yield openConsole(tab);
+    yield checkOutputForInputs(hud, inputTests);
+    inputTests = null;
+  }).then(finishTest);
+}
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_03.js b/browser/devtools/webconsole/test/browser_webconsole_output_03.js
index 5e430a058c1..afb40c49260 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_output_03.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_output_03.js
@@ -8,6 +8,7 @@
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console-output-03.html";
 
 let inputTests = [
+
   // 0
   {
     input: "document",
@@ -57,6 +58,7 @@ let inputTests = [
   {
     input: "window.location.href",
     output: '"' + TEST_URI + '"',
+    noClick: true,
   },
 
   // 6
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_04.js b/browser/devtools/webconsole/test/browser_webconsole_output_04.js
index eb6a525a3cf..d693ab2927f 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_output_04.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_output_04.js
@@ -110,11 +110,10 @@ let inputTests = [
 ];
 
 function test() {
-  addTab(TEST_URI);
-  browser.addEventListener("load", function onLoad() {
-    browser.removeEventListener("load", onLoad, true);
-    openConsole().then((hud) => {
-      return checkOutputForInputs(hud, inputTests);
-    }).then(finishTest);
-  }, true);
+  Task.spawn(function*() {
+    const {tab} = yield loadTab(TEST_URI);
+    const hud = yield openConsole(tab);
+    yield checkOutputForInputs(hud, inputTests);
+    inputTests = null;
+  }).then(finishTest);
 }
diff --git a/browser/devtools/webconsole/test/head.js b/browser/devtools/webconsole/test/head.js
index 32a6c612662..6b5004e2cf7 100644
--- a/browser/devtools/webconsole/test/head.js
+++ b/browser/devtools/webconsole/test/head.js
@@ -84,6 +84,32 @@ function loadTab(url) {
   return deferred.promise;
 }
 
+function loadBrowser(browser) {
+  let deferred = promise.defer();
+
+  browser.addEventListener("load", function onLoad() {
+    browser.removeEventListener("load", onLoad, true);
+    deferred.resolve(null)
+  }, true);
+
+  return deferred.promise;
+}
+
+function closeTab(tab) {
+  let deferred = promise.defer();
+
+  let container = gBrowser.tabContainer;
+
+  container.addEventListener("TabClose", function onTabClose() {
+    container.removeEventListener("TabClose", onTabClose, true);
+    deferred.resolve(null);
+  }, true);
+
+  gBrowser.removeTab(tab);
+
+  return deferred.promise;
+}
+
 function afterAllTabsLoaded(callback, win) {
   win = win || window;
 
@@ -1382,10 +1408,14 @@ function whenDelayedStartupFinished(aWindow, aCallback)
  *        - inspectorIcon: boolean, when true, the test runner expects the
  *        result widget to contain an inspectorIcon element (className
  *        open-inspector).
+ *
+ *        - expectedTab: string, optional, the full URL of the new tab which must
+ *        open. If this is not provided, any new tabs that open will cause a test
+ *        failure.
  */
 function checkOutputForInputs(hud, inputTests)
 {
-  let eventHandlers = new Set();
+  let container = gBrowser.tabContainer;
 
   function* runner()
   {
@@ -1393,10 +1423,7 @@ function checkOutputForInputs(hud, inputTests)
       info("checkInput(" + i + "): " + entry.input);
       yield checkInput(entry);
     }
-
-    for (let fn of eventHandlers) {
-      hud.jsterm.off("variablesview-open", fn);
-    }
+    container = null;
   }
 
   function* checkInput(entry)
@@ -1467,27 +1494,39 @@ function checkOutputForInputs(hud, inputTests)
     }
   }
 
-  function checkObjectClick(entry, msg)
+  function* checkObjectClick(entry, msg)
   {
     let body = msg.querySelector(".message-body a") ||
                msg.querySelector(".message-body");
     ok(body, "the message body");
 
-    let deferred = promise.defer();
-
-    entry._onVariablesViewOpen = onVariablesViewOpen.bind(null, entry, deferred);
+    let deferredVariablesView = promise.defer();
+    entry._onVariablesViewOpen = onVariablesViewOpen.bind(null, entry, deferredVariablesView);
     hud.jsterm.on("variablesview-open", entry._onVariablesViewOpen);
-    eventHandlers.add(entry._onVariablesViewOpen);
+
+    let deferredTab = promise.defer();
+    entry._onTabOpen = onTabOpen.bind(null, entry, deferredTab);
+    container.addEventListener("TabOpen", entry._onTabOpen, true);
 
     body.scrollIntoView();
     EventUtils.synthesizeMouse(body, 2, 2, {}, hud.iframeWindow);
 
     if (entry.inspectable) {
       info("message body tagName '" + body.tagName +  "' className '" + body.className + "'");
-      return deferred.promise; // wait for the panel to open if we need to.
+      yield deferredVariablesView.promise;
+    } else {
+      hud.jsterm.off("variablesview-open", entry._onVariablesView);
+      entry._onVariablesView = null;
     }
 
-    return promise.resolve(null);
+    if (entry.expectedTab) {
+      yield deferredTab.promise;
+    } else {
+      container.removeEventListener("TabOpen", entry._onTabOpen, true);
+      entry._onTabOpen = null;
+    }
+
+    yield promise.resolve(null);
   }
 
   function checkLinkToInspector(entry, msg)
@@ -1513,7 +1552,7 @@ function checkOutputForInputs(hud, inputTests)
     });
   }
 
-  function onVariablesViewOpen(entry, deferred, event, view, options)
+  function onVariablesViewOpen(entry, {resolve, reject}, event, view, options)
   {
     let label = entry.variablesViewLabel || entry.output;
     if (typeof label == "string" && options.label != label) {
@@ -1524,12 +1563,25 @@ function checkOutputForInputs(hud, inputTests)
     }
 
     hud.jsterm.off("variablesview-open", entry._onVariablesViewOpen);
-    eventHandlers.delete(entry._onVariablesViewOpen);
     entry._onVariablesViewOpen = null;
-
     ok(entry.inspectable, "variables view was shown");
 
-    deferred.resolve(null);
+    resolve(null);
+  }
+
+  function onTabOpen(entry, {resolve, reject}, event)
+  {
+    container.removeEventListener("TabOpen", entry._onTabOpen, true);
+    entry._onTabOpen = null;
+
+    let tab = event.target;
+    let browser = gBrowser.getBrowserForTab(tab);
+    loadBrowser(browser).then(() => {
+      let uri = content.location.href;
+      ok(entry.expectedTab && entry.expectedTab == uri,
+        "opened tab '" + uri +  "', expected tab '" + entry.expectedTab + "'");
+      return closeTab(tab);
+    }).then(resolve, reject);
   }
 
   return Task.spawn(runner);

From e0d2294003701aee40f0ad837c8fe8011104932a Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Thu, 5 Jun 2014 08:55:00 -0400
Subject: [PATCH 017/103] Bug 1012988 - Remove heritage dependency to
 packets.js. r=jimb

---
 toolkit/devtools/transport/packets.js | 308 +++++++++++++-------------
 1 file changed, 157 insertions(+), 151 deletions(-)

diff --git a/toolkit/devtools/transport/packets.js b/toolkit/devtools/transport/packets.js
index f5b50afa46f..e09e9b5fc22 100644
--- a/toolkit/devtools/transport/packets.js
+++ b/toolkit/devtools/transport/packets.js
@@ -25,7 +25,6 @@
  */
 
 const { Cc, Ci, Cu } = require("chrome");
-const Heritage = require("sdk/core/heritage");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 const { dumpn, dumpv } = DevToolsUtils;
 const StreamUtils = require("devtools/toolkit/transport/stream-utils");
@@ -128,83 +127,85 @@ JSONPacket.fromHeader = function(header, transport) {
 
 JSONPacket.HEADER_PATTERN = /^(\d+):$/;
 
-JSONPacket.prototype = Heritage.extend(Packet.prototype, {
+JSONPacket.prototype = Object.create(Packet.prototype);
 
+Object.defineProperty(JSONPacket.prototype, "object", {
   /**
    * Gets the object (not the serialized string) being read or written.
    */
-  get object() { return this._object; },
+  get: function() { return this._object; },
 
   /**
    * Sets the object to be sent when write() is called.
    */
-  set object(object) {
+  set: function(object) {
     this._object = object;
     let data = JSON.stringify(object);
     this._data = unicodeConverter.ConvertFromUnicode(data);
     this.length = this._data.length;
-  },
+  }
+});
 
-  read: function(stream, scriptableStream) {
-    dumpv("Reading JSON packet");
+JSONPacket.prototype.read = function(stream, scriptableStream) {
+  dumpv("Reading JSON packet");
 
-    // Read in more packet data.
-    this._readData(stream, scriptableStream);
+  // Read in more packet data.
+  this._readData(stream, scriptableStream);
 
-    if (!this.done) {
-      // Don't have a complete packet yet.
-      return;
-    }
-
-    let json = this._data;
-    try {
-      json = unicodeConverter.ConvertToUnicode(json);
-      this._object = JSON.parse(json);
-    } catch(e) {
-      let msg = "Error parsing incoming packet: " + json + " (" + e +
-                " - " + e.stack + ")";
-      if (Cu.reportError) {
-        Cu.reportError(msg);
-      }
-      dumpn(msg);
-      return;
-    }
-
-    this._transport._onJSONObjectReady(this._object);
-  },
-
-  _readData: function(stream, scriptableStream) {
-    if (dumpv.wantVerbose) {
-      dumpv("Reading JSON data: _l: " + this.length + " dL: " +
-            this._data.length + " sA: " + stream.available());
-    }
-    let bytesToRead = Math.min(this.length - this._data.length,
-                               stream.available());
-    this._data += scriptableStream.readBytes(bytesToRead);
-    this._done = this._data.length === this.length;
-  },
-
-  write: function(stream) {
-    dumpv("Writing JSON packet");
-
-    if (this._outgoing === undefined) {
-      // Format the serialized packet to a buffer
-      this._outgoing = this.length + ":" + this._data;
-    }
-
-    let written = stream.write(this._outgoing, this._outgoing.length);
-    this._outgoing = this._outgoing.slice(written);
-    this._done = !this._outgoing.length;
-  },
-
-  get done() { return this._done; },
-
-  toString: function() {
-    return JSON.stringify(this._object, null, 2);
+  if (!this.done) {
+    // Don't have a complete packet yet.
+    return;
   }
 
+  let json = this._data;
+  try {
+    json = unicodeConverter.ConvertToUnicode(json);
+    this._object = JSON.parse(json);
+  } catch(e) {
+    let msg = "Error parsing incoming packet: " + json + " (" + e +
+              " - " + e.stack + ")";
+    if (Cu.reportError) {
+      Cu.reportError(msg);
+    }
+    dumpn(msg);
+    return;
+  }
+
+  this._transport._onJSONObjectReady(this._object);
+}
+
+JSONPacket.prototype._readData = function(stream, scriptableStream) {
+  if (dumpv.wantVerbose) {
+    dumpv("Reading JSON data: _l: " + this.length + " dL: " +
+          this._data.length + " sA: " + stream.available());
+  }
+  let bytesToRead = Math.min(this.length - this._data.length,
+                             stream.available());
+  this._data += scriptableStream.readBytes(bytesToRead);
+  this._done = this._data.length === this.length;
+}
+
+JSONPacket.prototype.write = function(stream) {
+  dumpv("Writing JSON packet");
+
+  if (this._outgoing === undefined) {
+    // Format the serialized packet to a buffer
+    this._outgoing = this.length + ":" + this._data;
+  }
+
+  let written = stream.write(this._outgoing, this._outgoing.length);
+  this._outgoing = this._outgoing.slice(written);
+  this._done = !this._outgoing.length;
+}
+
+Object.defineProperty(JSONPacket.prototype, "done", {
+  get: function() { return this._done; }
 });
 
+JSONPacket.prototype.toString = function() {
+  return JSON.stringify(this._object, null, 2);
+}
+
 exports.JSONPacket = JSONPacket;
 
 /**
@@ -257,96 +258,99 @@ BulkPacket.fromHeader = function(header, transport) {
 
 BulkPacket.HEADER_PATTERN = /^bulk ([^: ]+) ([^: ]+) (\d+):$/;
 
-BulkPacket.prototype = Heritage.extend(Packet.prototype, {
+BulkPacket.prototype = Object.create(Packet.prototype);
 
-  read: function(stream) {
-    dumpv("Reading bulk packet, handing off input stream");
+BulkPacket.prototype.read = function(stream) {
+  dumpv("Reading bulk packet, handing off input stream");
 
-    // Temporarily pause monitoring of the input stream
-    this._transport.pauseIncoming();
+  // Temporarily pause monitoring of the input stream
+  this._transport.pauseIncoming();
 
-    let deferred = promise.defer();
+  let deferred = promise.defer();
 
-    this._transport._onBulkReadReady({
-      actor: this.actor,
-      type: this.type,
-      length: this.length,
-      copyTo: (output) => {
-        dumpv("CT length: " + this.length);
-        deferred.resolve(StreamUtils.copyStream(stream, output, this.length));
-        return deferred.promise;
-      },
-      stream: stream,
-      done: deferred
-    });
+  this._transport._onBulkReadReady({
+    actor: this.actor,
+    type: this.type,
+    length: this.length,
+    copyTo: (output) => {
+      dumpv("CT length: " + this.length);
+      deferred.resolve(StreamUtils.copyStream(stream, output, this.length));
+      return deferred.promise;
+    },
+    stream: stream,
+    done: deferred
+  });
 
-    // Await the result of reading from the stream
-    deferred.promise.then(() => {
-      dumpv("onReadDone called, ending bulk mode");
-      this._done = true;
-      this._transport.resumeIncoming();
-    }, this._transport.close);
+  // Await the result of reading from the stream
+  deferred.promise.then(() => {
+    dumpv("onReadDone called, ending bulk mode");
+    this._done = true;
+    this._transport.resumeIncoming();
+  }, this._transport.close);
 
-    // Ensure this is only done once
-    this.read = () => {
-      throw new Error("Tried to read() a BulkPacket's stream multiple times.");
-    };
-  },
+  // Ensure this is only done once
+  this.read = () => {
+    throw new Error("Tried to read() a BulkPacket's stream multiple times.");
+  };
+}
 
-  write: function(stream) {
-    dumpv("Writing bulk packet");
+BulkPacket.prototype.write = function(stream) {
+  dumpv("Writing bulk packet");
 
-    if (this._outgoingHeader === undefined) {
-      dumpv("Serializing bulk packet header");
-      // Format the serialized packet header to a buffer
-      this._outgoingHeader = "bulk " + this.actor + " " + this.type + " " +
-                             this.length + ":";
-    }
+  if (this._outgoingHeader === undefined) {
+    dumpv("Serializing bulk packet header");
+    // Format the serialized packet header to a buffer
+    this._outgoingHeader = "bulk " + this.actor + " " + this.type + " " +
+                           this.length + ":";
+  }
 
-    // Write the header, or whatever's left of it to write.
-    if (this._outgoingHeader.length) {
-      dumpv("Writing bulk packet header");
-      let written = stream.write(this._outgoingHeader,
-                                 this._outgoingHeader.length);
-      this._outgoingHeader = this._outgoingHeader.slice(written);
-      return;
-    }
+  // Write the header, or whatever's left of it to write.
+  if (this._outgoingHeader.length) {
+    dumpv("Writing bulk packet header");
+    let written = stream.write(this._outgoingHeader,
+                               this._outgoingHeader.length);
+    this._outgoingHeader = this._outgoingHeader.slice(written);
+    return;
+  }
 
-    dumpv("Handing off output stream");
+  dumpv("Handing off output stream");
 
-    // Temporarily pause the monitoring of the output stream
-    this._transport.pauseOutgoing();
+  // Temporarily pause the monitoring of the output stream
+  this._transport.pauseOutgoing();
 
-    let deferred = promise.defer();
+  let deferred = promise.defer();
 
-    this._readyForWriting.resolve({
-      copyFrom: (input) => {
-        dumpv("CF length: " + this.length);
-        deferred.resolve(StreamUtils.copyStream(input, stream, this.length));
-        return deferred.promise;
-      },
-      stream: stream,
-      done: deferred
-    });
+  this._readyForWriting.resolve({
+    copyFrom: (input) => {
+      dumpv("CF length: " + this.length);
+      deferred.resolve(StreamUtils.copyStream(input, stream, this.length));
+      return deferred.promise;
+    },
+    stream: stream,
+    done: deferred
+  });
 
-    // Await the result of writing to the stream
-    deferred.promise.then(() => {
-      dumpv("onWriteDone called, ending bulk mode");
-      this._done = true;
-      this._transport.resumeOutgoing();
-    }, this._transport.close);
+  // Await the result of writing to the stream
+  deferred.promise.then(() => {
+    dumpv("onWriteDone called, ending bulk mode");
+    this._done = true;
+    this._transport.resumeOutgoing();
+  }, this._transport.close);
 
-    // Ensure this is only done once
-    this.write = () => {
-      throw new Error("Tried to write() a BulkPacket's stream multiple times.");
-    };
-  },
+  // Ensure this is only done once
+  this.write = () => {
+    throw new Error("Tried to write() a BulkPacket's stream multiple times.");
+  };
+}
 
-  get streamReadyForWriting() {
+Object.defineProperty(BulkPacket.prototype, "streamReadyForWriting", {
+  get: function() {
     return this._readyForWriting.promise;
-  },
+  }
+});
 
-  get header() {
+Object.defineProperty(BulkPacket.prototype, "header", {
+  get: function() {
     return {
       actor: this.actor,
       type: this.type,
@@ -354,20 +358,22 @@ BulkPacket.prototype = Heritage.extend(Packet.prototype, {
     };
   },
 
-  set header(header) {
+  set: function(header) {
     this.actor = header.actor;
     this.type = header.type;
     this.length = header.length;
   },
-
-  get done() { return this._done; },
-
-  toString: function() {
-    return "Bulk: " + JSON.stringify(this.header, null, 2);
-  }
-
 });
 
+Object.defineProperty(BulkPacket.prototype, "done", {
+  get: function() { return this._done; },
+});
+
+
+BulkPacket.prototype.toString = function() {
+  return "Bulk: " + JSON.stringify(this.header, null, 2);
+}
+
 exports.BulkPacket = BulkPacket;
 
 /**
@@ -385,21 +391,21 @@ function RawPacket(transport, data) {
   this._done = false;
 }
 
-RawPacket.prototype = Heritage.extend(Packet.prototype, {
+RawPacket.prototype = Object.create(Packet.prototype);
 
-  read: function(stream) {
-    // This hasn't yet been needed for testing.
-    throw Error("Not implmented.");
-  },
+RawPacket.prototype.read = function(stream) {
+  // This hasn't yet been needed for testing.
+  throw Error("Not implmented.");
+}
 
-  write: function(stream) {
-    let written = stream.write(this._data, this._data.length);
-    this._data = this._data.slice(written);
-    this._done = !this._data.length;
-  },
-
-  get done() { return this._done; }
+RawPacket.prototype.write = function(stream) {
+  let written = stream.write(this._data, this._data.length);
+  this._data = this._data.slice(written);
+  this._done = !this._data.length;
+}
 
+Object.defineProperty(RawPacket.prototype, "done", {
+  get: function() { return this._done; }
 });
 
 exports.RawPacket = RawPacket;

From 5696b86f43d61b39973be0a35dd2001b7a8f2091 Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Thu, 5 Jun 2014 13:38:00 -0400
Subject: [PATCH 018/103] Bug 1019676 - Project editor: Allow app header to be
 updated and add gear icon / status indicator. r=harth

---
 .../chrome/content/projecteditor-loader.js    |   8 +-
 .../chrome/content/projecteditor.xul          |   2 -
 .../lib/plugins/app-manager/plugin.js         |  21 ++-
 browser/devtools/projecteditor/lib/project.js |   8 +-
 .../projecteditor/lib/projecteditor.js        |  21 ++-
 browser/devtools/projecteditor/lib/tree.js    |   9 +-
 .../devtools/projecteditor/test/browser.ini   |   1 +
 .../test/browser_projecteditor_app_options.js | 102 +++++++++++++
 .../test/browser_projecteditor_editing_01.js  |   2 +-
 .../test/browser_projecteditor_stores.js      |   6 +-
 .../browser_projecteditor_tree_selection.js   |   2 +-
 .../devtools/projecteditor/projecteditor.css  | 137 ++++++++++++------
 12 files changed, 250 insertions(+), 69 deletions(-)
 create mode 100644 browser/devtools/projecteditor/test/browser_projecteditor_app_options.js

diff --git a/browser/devtools/projecteditor/chrome/content/projecteditor-loader.js b/browser/devtools/projecteditor/chrome/content/projecteditor-loader.js
index 1f626aec6d9..2954d4cb24b 100644
--- a/browser/devtools/projecteditor/chrome/content/projecteditor-loader.js
+++ b/browser/devtools/projecteditor/chrome/content/projecteditor-loader.js
@@ -7,9 +7,9 @@ const promise = require("projecteditor/helpers/promise");
 const ProjectEditor = require("projecteditor/projecteditor");
 
 const SAMPLE_PATH = buildTempDirectoryStructure();
-const SAMPLE_NAME = "DevTools Content";
+const SAMPLE_NAME = "DevTools Content Application Name";
 const SAMPLE_PROJECT_URL = "http://mozilla.org";
-const SAMPLE_ICON = "chrome://browser/skin/devtools/tool-options.svg";
+const SAMPLE_ICON = "chrome://browser/skin/devtools/tool-debugger.svg";
 
 /**
  * Create a workspace for working on projecteditor, available at
@@ -56,11 +56,13 @@ document.addEventListener("DOMContentLoaded", function onDOMReady(e) {
     projecteditor.setProjectToAppPath(SAMPLE_PATH, {
       name: SAMPLE_NAME,
       iconUrl: SAMPLE_ICON,
-      projectOverviewURL: SAMPLE_PROJECT_URL
+      projectOverviewURL: SAMPLE_PROJECT_URL,
+      validationStatus: "valid"
     }).then(() => {
       let allResources = projecteditor.project.allResources();
       console.log("All resources have been loaded", allResources, allResources.map(r=>r.basename).join("|"));
     });
+
   });
 
 }, false);
diff --git a/browser/devtools/projecteditor/chrome/content/projecteditor.xul b/browser/devtools/projecteditor/chrome/content/projecteditor.xul
index 9f5e59d4935..0ab13a74d4f 100644
--- a/browser/devtools/projecteditor/chrome/content/projecteditor.xul
+++ b/browser/devtools/projecteditor/chrome/content/projecteditor.xul
@@ -4,10 +4,8 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://browser/skin/devtools/light-theme.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/projecteditor/projecteditor.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/devtools/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/devtools/debugger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/devtools/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/devtools/markup-view.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/markup-view.css" type="text/css"?>
 
diff --git a/browser/devtools/projecteditor/lib/plugins/app-manager/plugin.js b/browser/devtools/projecteditor/lib/plugins/app-manager/plugin.js
index fc79ee3960e..d3979236de7 100644
--- a/browser/devtools/projecteditor/lib/plugins/app-manager/plugin.js
+++ b/browser/devtools/projecteditor/lib/plugins/app-manager/plugin.js
@@ -5,6 +5,7 @@ const { emit } = require("sdk/event/core");
 const promise = require("projecteditor/helpers/promise");
 var { registerPlugin, Plugin } = require("projecteditor/plugins/core");
 const { AppProjectEditor } = require("./app-project-editor");
+const OPTION_URL = "chrome://browser/skin/devtools/tool-options.svg";
 
 var AppManagerRenderer = Class({
   extends: Plugin,
@@ -25,20 +26,32 @@ var AppManagerRenderer = Class({
     let {appManagerOpts} = this.host.project;
     let doc = elt.ownerDocument;
     let image = doc.createElement("image");
-    let label = doc.createElement("label");
+    let optionImage = doc.createElement("image");
+    let flexElement = doc.createElement("div");
+    let nameLabel = doc.createElement("span");
+    let statusElement = doc.createElement("div");
 
-    label.className = "project-name-label";
     image.className = "project-image";
+    optionImage.className = "project-options";
+    nameLabel.className = "project-name-label";
+    statusElement.className = "project-status";
+    flexElement.className = "project-flex";
 
     let name = appManagerOpts.name || resource.basename;
     let url = appManagerOpts.iconUrl || "icon-sample.png";
+    let status = appManagerOpts.validationStatus || "unknown";
 
-    label.textContent = name;
+    nameLabel.textContent = name;
     image.setAttribute("src", url);
+    optionImage.setAttribute("src", OPTION_URL);
+    statusElement.setAttribute("status", status)
 
     elt.innerHTML = "";
     elt.appendChild(image);
-    elt.appendChild(label);
+    elt.appendChild(nameLabel);
+    elt.appendChild(flexElement);
+    elt.appendChild(statusElement);
+    elt.appendChild(optionImage);
     return true;
   }
 });
diff --git a/browser/devtools/projecteditor/lib/project.js b/browser/devtools/projecteditor/lib/project.js
index 8b19117ae24..59d0dc513a6 100644
--- a/browser/devtools/projecteditor/lib/project.js
+++ b/browser/devtools/projecteditor/lib/project.js
@@ -136,13 +136,11 @@ var Project = Class({
   /**
    * Get every file path used inside of the project.
    *
-   * @returns generator-iterator<string>
+   * @returns Array<string>
    *          A list of all file paths
    */
-  allPaths: function*() {
-    for (let [path, store] of this.localStores) {
-      yield path;
-    }
+  allPaths: function() {
+    return [path for (path of this.localStores.keys())];
   },
 
   /**
diff --git a/browser/devtools/projecteditor/lib/projecteditor.js b/browser/devtools/projecteditor/lib/projecteditor.js
index 2e3ca9653f8..d0e0efd5742 100644
--- a/browser/devtools/projecteditor/lib/projecteditor.js
+++ b/browser/devtools/projecteditor/lib/projecteditor.js
@@ -264,14 +264,29 @@ var ProjectEditor = Class({
    * @param string path
    *               The file path to set
    * @param Object opts
-   *               Custom options used by the project. See plugins/app-manager.
+   *               Custom options used by the project.
+   *                - name: display name for project
+   *                - iconUrl: path to icon for project
+   *                - validationStatus: one of 'unknown|error|warning|valid'
+   *                - projectOverviewURL: path to load for iframe when project
+   *                    is selected in the tree.
    * @param Promise
    *        Promise that is resolved once the project is ready to be used.
    */
   setProjectToAppPath: function(path, opts = {}) {
     this.project.appManagerOpts = opts;
-    this.project.removeAllStores();
-    this.project.addPath(path);
+
+    let existingPaths = this.project.allPaths();
+    if (existingPaths.length !== 1 || existingPaths[0] !== path) {
+      // Only fully reset if this is a new path.
+      this.project.removeAllStores();
+      this.project.addPath(path);
+    } else {
+      // Otherwise, just ask for the root to be redrawn
+      let rootResource = this.project.localStores.get(path).root;
+      emit(rootResource, "label-change", rootResource);
+    }
+
     return this.project.refresh();
   },
 
diff --git a/browser/devtools/projecteditor/lib/tree.js b/browser/devtools/projecteditor/lib/tree.js
index 7edeeadd545..efe2b1a8866 100644
--- a/browser/devtools/projecteditor/lib/tree.js
+++ b/browser/devtools/projecteditor/lib/tree.js
@@ -39,7 +39,7 @@ var ResourceContainer = Class({
 
     this.line = doc.createElementNS(HTML_NS, "div");
     this.line.classList.add("child");
-    this.line.classList.add("side-menu-widget-item");
+    this.line.classList.add("entry");
     this.line.setAttribute("theme", "dark");
     this.line.setAttribute("tabindex", "0");
 
@@ -223,15 +223,14 @@ var TreeView = Class({
     this.models = new Set();
     this.roots = new Set();
     this._containers = new Map();
-    this.elt = document.createElement("vbox");
+    this.elt = document.createElementNS(HTML_NS, "div");
     this.elt.tree = this;
-    this.elt.className = "side-menu-widget-container sources-tree";
+    this.elt.className = "sources-tree";
     this.elt.setAttribute("with-arrows", "true");
     this.elt.setAttribute("theme", "dark");
     this.elt.setAttribute("flex", "1");
 
     this.children = document.createElementNS(HTML_NS, "ul");
-    this.children.setAttribute("flex", "1");
     this.elt.appendChild(this.children);
 
     this.resourceChildrenChanged = this.resourceChildrenChanged.bind(this);
@@ -315,7 +314,7 @@ var TreeView = Class({
         return;
       }
       let container = this.importResource(root);
-      container.line.classList.add("side-menu-widget-group-title");
+      container.line.classList.add("entry-group-title");
       container.line.setAttribute("theme", "dark");
       this.selectContainer(container);
 
diff --git a/browser/devtools/projecteditor/test/browser.ini b/browser/devtools/projecteditor/test/browser.ini
index 965ff56493e..a39efe1e5e4 100644
--- a/browser/devtools/projecteditor/test/browser.ini
+++ b/browser/devtools/projecteditor/test/browser.ini
@@ -5,6 +5,7 @@ support-files =
   head.js
   helper_homepage.html
 
+[browser_projecteditor_app_options.js]
 [browser_projecteditor_delete_file.js]
 [browser_projecteditor_editing_01.js]
 [browser_projecteditor_immediate_destroy.js]
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_app_options.js b/browser/devtools/projecteditor/test/browser_projecteditor_app_options.js
new file mode 100644
index 00000000000..2141c19b033
--- /dev/null
+++ b/browser/devtools/projecteditor/test/browser_projecteditor_app_options.js
@@ -0,0 +1,102 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Test that options can be changed without resetting the whole
+// editor.
+let test = asyncTest(function*() {
+
+  let TEMP_PATH = buildTempDirectoryStructure();
+  let projecteditor = yield addProjectEditorTab();
+
+  let resourceBeenAdded = promise.defer();
+  projecteditor.project.once("resource-added", () => {
+    info ("A resource has been added");
+    resourceBeenAdded.resolve();
+  });
+
+  info ("About to set project to: " + TEMP_PATH);
+  yield projecteditor.setProjectToAppPath(TEMP_PATH, {
+    name: "Test",
+    iconUrl: "chrome://browser/skin/devtools/tool-options.svg",
+    projectOverviewURL: SAMPLE_WEBAPP_URL
+  });
+
+  info ("Making sure a resource has been added before continuing");
+  yield resourceBeenAdded.promise;
+
+  info ("From now on, if a resource is added it should fail");
+  projecteditor.project.on("resource-added", failIfResourceAdded);
+
+  info ("Getting ahold and validating the project header DOM");
+  let header = projecteditor.document.querySelector(".entry-group-title");
+  let image = header.querySelector(".project-image");
+  let nameLabel = header.querySelector(".project-name-label");
+  let statusElement = header.querySelector(".project-status");
+  is (statusElement.getAttribute("status"), "unknown", "The status starts out as unknown.");
+  is (nameLabel.textContent, "Test", "The name label has been set correctly");
+  is (image.getAttribute("src"), "chrome://browser/skin/devtools/tool-options.svg", "The icon has been set correctly");
+
+  info ("About to set project with new options.");
+  yield projecteditor.setProjectToAppPath(TEMP_PATH, {
+    name: "Test2",
+    iconUrl: "chrome://browser/skin/devtools/tool-inspector.svg",
+    projectOverviewURL: SAMPLE_WEBAPP_URL,
+    validationStatus: "error"
+  });
+
+  ok (!nameLabel.parentNode, "The old elements have been removed");
+
+  info ("Getting ahold of and validating the project header DOM");
+  let image = header.querySelector(".project-image");
+  let nameLabel = header.querySelector(".project-name-label");
+  let statusElement = header.querySelector(".project-status");
+  is (statusElement.getAttribute("status"), "error", "The status has been set correctly.");
+  is (nameLabel.textContent, "Test2", "The name label has been set correctly");
+  is (image.getAttribute("src"), "chrome://browser/skin/devtools/tool-inspector.svg", "The icon has been set correctly");
+
+  info ("About to set project with new options.");
+  yield projecteditor.setProjectToAppPath(TEMP_PATH, {
+    name: "Test3",
+    iconUrl: "chrome://browser/skin/devtools/tool-webconsole.svg",
+    projectOverviewURL: SAMPLE_WEBAPP_URL,
+    validationStatus: "warning"
+  });
+
+  ok (!nameLabel.parentNode, "The old elements have been removed");
+
+  info ("Getting ahold of and validating the project header DOM");
+  let image = header.querySelector(".project-image");
+  let nameLabel = header.querySelector(".project-name-label");
+  let statusElement = header.querySelector(".project-status");
+  is (statusElement.getAttribute("status"), "warning", "The status has been set correctly.");
+  is (nameLabel.textContent, "Test3", "The name label has been set correctly");
+  is (image.getAttribute("src"), "chrome://browser/skin/devtools/tool-webconsole.svg", "The icon has been set correctly");
+
+  info ("About to set project with new options.");
+  yield projecteditor.setProjectToAppPath(TEMP_PATH, {
+    name: "Test4",
+    iconUrl: "chrome://browser/skin/devtools/tool-debugger.svg",
+    projectOverviewURL: SAMPLE_WEBAPP_URL,
+    validationStatus: "valid"
+  });
+
+  ok (!nameLabel.parentNode, "The old elements have been removed");
+
+  info ("Getting ahold of and validating the project header DOM");
+  let image = header.querySelector(".project-image");
+  let nameLabel = header.querySelector(".project-name-label");
+  let statusElement = header.querySelector(".project-status");
+  is (statusElement.getAttribute("status"), "valid", "The status has been set correctly.");
+  is (nameLabel.textContent, "Test4", "The name label has been set correctly");
+  is (image.getAttribute("src"), "chrome://browser/skin/devtools/tool-debugger.svg", "The icon has been set correctly");
+
+  info ("Test finished, cleaning up");
+  projecteditor.project.off("resource-added", failIfResourceAdded);
+});
+
+function failIfResourceAdded() {
+  ok (false, "A resource has been added, but it shouldn't have been");
+}
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_editing_01.js b/browser/devtools/projecteditor/test/browser_projecteditor_editing_01.js
index db8b5e2591b..b31d446012c 100644
--- a/browser/devtools/projecteditor/test/browser_projecteditor_editing_01.js
+++ b/browser/devtools/projecteditor/test/browser_projecteditor_editing_01.js
@@ -7,7 +7,7 @@
 // Test ProjectEditor basic functionality
 let test = asyncTest(function*() {
   let projecteditor = yield addProjectEditorTabForTempDirectory();
-  let TEMP_PATH = [...projecteditor.project.allPaths()][0];
+  let TEMP_PATH = projecteditor.project.allPaths()[0];
 
   is (getTempFile("").path, TEMP_PATH, "Temp path is set correctly.");
 
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_stores.js b/browser/devtools/projecteditor/test/browser_projecteditor_stores.js
index 08b356af73f..8c375ea8378 100644
--- a/browser/devtools/projecteditor/test/browser_projecteditor_stores.js
+++ b/browser/devtools/projecteditor/test/browser_projecteditor_stores.js
@@ -7,10 +7,10 @@
 // Test ProjectEditor basic functionality
 let test = asyncTest(function*() {
   let projecteditor = yield addProjectEditorTabForTempDirectory();
-  let TEMP_PATH = [...projecteditor.project.allPaths()][0];
+  let TEMP_PATH = projecteditor.project.allPaths()[0];
   is (getTempFile("").path, TEMP_PATH, "Temp path is set correctly.");
 
-  is ([...projecteditor.project.allPaths()].length, 1, "1 path is set");
+  is (projecteditor.project.allPaths().length, 1, "1 path is set");
   projecteditor.project.removeAllStores();
-  is ([...projecteditor.project.allPaths()].length, 0, "No paths are remaining");
+  is (projecteditor.project.allPaths().length, 0, "No paths are remaining");
 });
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_tree_selection.js b/browser/devtools/projecteditor/test/browser_projecteditor_tree_selection.js
index 3835fab0b72..9d23c979354 100644
--- a/browser/devtools/projecteditor/test/browser_projecteditor_tree_selection.js
+++ b/browser/devtools/projecteditor/test/browser_projecteditor_tree_selection.js
@@ -8,7 +8,7 @@
 
 let test = asyncTest(function*() {
   let projecteditor = yield addProjectEditorTabForTempDirectory();
-  let TEMP_PATH = [...projecteditor.project.allPaths()][0];
+  let TEMP_PATH = projecteditor.project.allPaths()[0];
 
   is (getTempFile("").path, TEMP_PATH, "Temp path is set correctly.");
 
diff --git a/browser/themes/shared/devtools/projecteditor/projecteditor.css b/browser/themes/shared/devtools/projecteditor/projecteditor.css
index 1d11f603bbe..6fa7fd43e03 100644
--- a/browser/themes/shared/devtools/projecteditor/projecteditor.css
+++ b/browser/themes/shared/devtools/projecteditor/projecteditor.css
@@ -11,6 +11,20 @@
   display: none;
 }
 
+.arrow {
+  -moz-appearance: treetwisty;
+  width: 20px;
+  height: 20px;
+}
+
+.arrow[open] {
+  -moz-appearance: treetwistyopen;
+}
+
+.arrow[invisible] {
+  visibility: hidden;
+}
+
 #projecteditor-menubar {
   /* XXX: Hide menu bar until we have option to add menu items
      to an existing one. */
@@ -27,7 +41,13 @@
 
 .sources-tree {
   overflow:auto;
+  overflow-x: hidden;
   -moz-user-focus: normal;
+
+  /* Allows this to expand inside of parent xul element, while
+     still supporting child flexbox elements, including ellipses. */
+  -moz-box-flex: 1;
+  display: block;
 }
 
 .sources-tree input {
@@ -37,94 +57,95 @@
 
 #main-deck .sources-tree {
   background: rgb(225, 225, 225);
-  min-width: 50px;
+  min-width: 100px;
 }
 
-#main-deck .sources-tree .side-menu-widget-item {
+.entry {
   color: #18191A;
+  display: flex;
+  align-items: center;
 }
 
-#main-deck .sources-tree .side-menu-widget-item .file-label {
-  vertical-align: middle;
-  display: inline-block;
+.entry .file-label {
+  display: flex;
+  flex: 1;
+  align-items: center;
 }
 
-#main-deck .sources-tree .side-menu-widget-item .file-icon {
+.entry .file-icon {
   display: inline-block;
   background: url(file-icons-sheet@2x.png);
   background-size: 140px 15px;
   background-repeat: no-repeat;
   width: 20px;
   height: 15px;
-  vertical-align: middle;
   background-position: -40px 0;
+  flex-shrink: 0;
 }
 
-#main-deck .sources-tree .side-menu-widget-item .file-icon.icon-none {
+.entry .file-icon.icon-none {
   display: none;
 }
 
-#main-deck .sources-tree .side-menu-widget-item .icon-css {
+.entry .icon-css {
   background-position: 0 0;
 }
 
-#main-deck .sources-tree .side-menu-widget-item .icon-js {
+.entry .icon-js {
   background-position: -20px 0;
 }
 
-#main-deck .sources-tree .side-menu-widget-item .icon-html {
+.entry .icon-html {
   background-position: -40px 0;
 }
 
-#main-deck .sources-tree .side-menu-widget-item .icon-file {
+.entry .icon-file {
   background-position: -60px 0;
 }
 
-#main-deck .sources-tree .side-menu-widget-item .icon-folder {
+.entry .icon-folder {
   background-position: -80px 0;
 }
 
-#main-deck .sources-tree .side-menu-widget-item .icon-img {
+.entry .icon-img {
   background-position: -100px 0;
 }
 
-#main-deck .sources-tree .side-menu-widget-item .icon-manifest {
+.entry .icon-manifest {
   background-position: -120px 0;
 }
 
-#main-deck .sources-tree .side-menu-widget-item:hover {
-  background: rgba(0, 0, 0, .05);
+.entry {
+  border: none;
+  box-shadow: none;
+  white-space: nowrap;
   cursor: pointer;
 }
 
-#main-deck .sources-tree .side-menu-widget-item {
-  border: none;
-  box-shadow: none;
-  line-height: 20px;
-  vertical-align: middle;
-  white-space: nowrap;
+.entry:hover:not(.entry-group-title):not(.selected) {
+  background: rgba(0, 0, 0, .05);
 }
 
-#main-deck .sources-tree .side-menu-widget-item.selected {
-  background: #3875D7;
+.entry.selected {
+  background: rgba(56, 117, 215, 1);
   color: #F5F7FA;
   outline: none;
 }
 
-#main-deck .sources-tree .side-menu-widget-group-title,
-#main-deck .sources-tree .side-menu-widget-group-title:hover:not(.selected) {
-  background: #B4D7EB;
-  color: #222;
+.entry-group-title {
+  background: rgba(56, 117, 215, 0.8);
+  color: #F5F7FA;
   font-weight: bold;
   font-size: 1.05em;
-  cursor: default;
   line-height: 35px;
+  padding: 0 10px;
 }
 
-#main-deck .sources-tree li.child:only-child .side-menu-widget-group-title .expander {
+.sources-tree .entry-group-title .expander {
   display: none;
 }
-#main-deck .sources-tree .side-menu-widget-item .expander {
+
+.entry .expander {
   width: 16px;
   padding: 0;
 }
@@ -143,30 +164,62 @@
   padding: 0 3px;
 }
 
+/* App Manager */
 .project-name-label {
   font-weight: bold;
   padding-left: 10px;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
-.project-version-label {
-  color: #666;
-  padding-left: 5px;
-  font-size: .9em;
+.project-flex {
+  flex: 1;
 }
 
 .project-image {
-  max-height: 28px;
-  margin-left: -.5em;
-  vertical-align: middle;
+  max-height: 25px;
+  margin-left: -10px;
 }
 
-.editor-image {
-  padding: 10px;
+.project-image,
+.project-status,
+.project-options {
+  flex-shrink: 0;
 }
 
+.project-status {
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  border: solid 1px rgba(255, 255, 255, .5);
+  margin-right: 10px;
+  visibility: hidden;
+}
+
+.project-status[status=valid] {
+  background: #70bf53;
+  visibility: visible;
+}
+
+.project-status[status=warning] {
+  background: #d99b28;
+  visibility: visible;
+}
+
+.project-status[status=error] {
+  background: #ed2655;
+  visibility: visible;
+}
+
+/* Status Bar */
 .projecteditor-file-label {
   font-weight: bold;
   padding-left: 29px;
-  vertical-align: middle;
+  padding-right: 10px;
+  flex: 1;
 }
 
+/* Image View */
+.editor-image {
+  padding: 10px;
+}

From 74242afd1fd17bc6bc65ffe28316fa463090c1fb Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Thu, 5 Jun 2014 08:40:00 -0400
Subject: [PATCH 019/103] Bug 1021023 - Fix 'document is null' error in
 CssLogic_findCssSelector when inspecting <window> in XUL document. r=pbrosset

---
 toolkit/devtools/styleinspector/css-logic.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/toolkit/devtools/styleinspector/css-logic.js b/toolkit/devtools/styleinspector/css-logic.js
index f3057ea2c9b..dd675bd14ce 100644
--- a/toolkit/devtools/styleinspector/css-logic.js
+++ b/toolkit/devtools/styleinspector/css-logic.js
@@ -917,10 +917,13 @@ CssLogic.findCssSelector = function CssLogic_findCssSelector(ele) {
     }
   }
 
-  // So we can be unique w.r.t. our parent, and use recursion
-  index = positionInNodeList(ele, ele.parentNode.children) + 1;
-  selector = CssLogic_findCssSelector(ele.parentNode) + ' > ' +
-          tagName + ':nth-child(' + index + ')';
+  // Not unique enough yet.  As long as it's not a child of the document,
+  // continue recursing up until it is unique enough.
+  if (ele.parentNode !== document) {
+    index = positionInNodeList(ele, ele.parentNode.children) + 1;
+    selector = CssLogic_findCssSelector(ele.parentNode) + ' > ' +
+            tagName + ':nth-child(' + index + ')';
+  }
 
   return selector;
 };

From 487b9d5d2f4827c2ed886ef7d2ca098a2a99ce1e Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim007@gmail.com>
Date: Thu, 5 Jun 2014 05:14:00 -0400
Subject: [PATCH 020/103] Bug 983814 - Use menuPanel.png instead of
 menuPanel-aero.png for Windows 8. r=Gijs

---
 browser/themes/windows/jar.mn | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 7027dd4df24..582457dc49d 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -440,11 +440,13 @@ browser.jar:
         skin/classic/aero/browser/livemark-folder.png                (livemark-folder-aero.png)
         skin/classic/aero/browser/menu-back.png                      (menu-back-aero.png)
         skin/classic/aero/browser/menu-forward.png                   (menu-forward-aero.png)
-        skin/classic/aero/browser/menuPanel.png                      (menuPanel-aero.png)
+        skin/classic/aero/browser/menuPanel.png
+        skin/classic/aero/browser/menuPanel-aero.png
         skin/classic/aero/browser/menuPanel-customize.png
         skin/classic/aero/browser/menuPanel-exit.png
         skin/classic/aero/browser/menuPanel-help.png
-        skin/classic/aero/browser/menuPanel-small.png                (menuPanel-small-aero.png)
+        skin/classic/aero/browser/menuPanel-small.png
+        skin/classic/aero/browser/menuPanel-small-aero.png
         skin/classic/aero/browser/Metro_Glyph.png                    (Metro_Glyph-aero.png)
         skin/classic/aero/browser/Metro_Glyph-inverted.png
         skin/classic/aero/browser/Metro_Glyph-menuPanel.png
@@ -806,5 +808,11 @@ browser.jar:
 % override chrome://browser/skin/Toolbar.png               chrome://browser/skin/Toolbar-aero.png                  os=WINNT osversion=6
 % override chrome://browser/skin/Toolbar.png               chrome://browser/skin/Toolbar-aero.png                  os=WINNT osversion=6.1
 
+% override chrome://browser/skin/menuPanel.png             chrome://browser/skin/menuPanel-aero.png                os=WINNT osversion=6
+% override chrome://browser/skin/menuPanel.png             chrome://browser/skin/menuPanel-aero.png                os=WINNT osversion=6.1
+
+% override chrome://browser/skin/menuPanel-small.png       chrome://browser/skin/menuPanel-small-aero.png          os=WINNT osversion=6
+% override chrome://browser/skin/menuPanel-small.png       chrome://browser/skin/menuPanel-small-aero.png          os=WINNT osversion=6.1
+
 % override chrome://browser/skin/sync-horizontalbar.png          chrome://browser/skin/sync-horizontalbar-XPVista7.png          os=WINNT osversion<6.2
 % override chrome://browser/skin/syncProgress-horizontalbar.png  chrome://browser/skin/syncProgress-horizontalbar-XPVista7.png  os=WINNT osversion<6.2

From 2bcb53065ece44999f1a5c6d69d9ba7011a35048 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 14:36:09 -0700
Subject: [PATCH 021/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/a98c1c4a288a
Author: Dave Hylands <dhylands@gmail.com>
Desc: Merge pull request #20098 from dhylands/bug-986331-3g2

Bug 986331 - Add support for .3g2 file extension (maps to video/3gpp2 mime type) r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/e4eba407bd07
Author: Dave Hylands <dhylands@gmail.com>
Desc: Bug 986331 - Add support for .3g2 file extension (maps to video/3gpp2 mime type)
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 97b514e0631..6a20b1204fe 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "e32dee285e41ff8be7779ab4adb3db81a5b36570", 
+    "revision": "a98c1c4a288a235a83341b0805ca0450afb9dc26", 
     "repo_path": "/integration/gaia-central"
 }

From 548d21ad5b106e7ef2c480950bcfabb9f461cdfe Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 14:41:34 -0700
Subject: [PATCH 022/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 5bf405bbb80..b232cfd6e96 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="857129928b6e56a809cee9d5445effb8fa9f1c2c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 5d1a9acfec5..fb6f39c1ef4 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="857129928b6e56a809cee9d5445effb8fa9f1c2c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index e4415eca213..6c070ad85db 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="857129928b6e56a809cee9d5445effb8fa9f1c2c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 5bf405bbb80..b232cfd6e96 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="857129928b6e56a809cee9d5445effb8fa9f1c2c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index f58f9346c7e..67e46ebd2e8 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="857129928b6e56a809cee9d5445effb8fa9f1c2c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index c45e04d024b..374f9cc4e78 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="857129928b6e56a809cee9d5445effb8fa9f1c2c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index fd7b2133aea..19575e3a60f 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="857129928b6e56a809cee9d5445effb8fa9f1c2c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index e24cf0539ef..e117aaeb86f 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="857129928b6e56a809cee9d5445effb8fa9f1c2c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 6c8ca87bf71..5c2d383c801 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="857129928b6e56a809cee9d5445effb8fa9f1c2c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 70371d236090cbd96346367a0f8402a576504f44 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 15:05:51 -0700
Subject: [PATCH 023/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/d83630d272b1
Author: Jared Hirsch <ohai@6a68.net>
Desc: Merge pull request #20042 from 6a68/bug-998012-tos-pp

Bug 998012 - Add FxA Terms/Privacy text to the system app

========

https://hg.mozilla.org/integration/gaia-central/rev/a7fb8b24440f
Author: Jared Hirsch <ohai@6a68.net>
Desc: Bug 998012 - Add FxA Terms/Privacy text to the system app r=alive
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 6a20b1204fe..a8cd9c44565 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "a98c1c4a288a235a83341b0805ca0450afb9dc26", 
+    "revision": "d83630d272b12024d89f8cb93838117b1cb599aa", 
     "repo_path": "/integration/gaia-central"
 }

From cbc71a3d3eb8ecd44fcb5a15cd2b5dc731a89646 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 15:11:29 -0700
Subject: [PATCH 024/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index b232cfd6e96..a7ea2897d6a 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index fb6f39c1ef4..3b402b759e1 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 6c070ad85db..adcbaf04c78 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index b232cfd6e96..a7ea2897d6a 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 67e46ebd2e8..1533b8d9e56 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 374f9cc4e78..7f297784194 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 19575e3a60f..230d15095f9 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index e117aaeb86f..dd1cf3af3b2 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 5c2d383c801..d5bee892590 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8fa772d0ad8cfa61b005c7aa7f09d2a8531ee2d8"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From ae5af46c02e26bc9dd3504864495b372910eb46e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 17:11:12 -0700
Subject: [PATCH 025/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/02e1830c641f
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #20041 from davidflanagan/bug1020273

Bug 1020273: make the Gallery crop handles more sensitive r=pdahiya

========

https://hg.mozilla.org/integration/gaia-central/rev/07ff3b9fe5ef
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 1020273: make the Gallery crop handles more sensitive
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index a8cd9c44565..ae0889e5dc0 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "d83630d272b12024d89f8cb93838117b1cb599aa", 
+    "revision": "02e1830c641fe10d272caa8ce228057557f86155", 
     "repo_path": "/integration/gaia-central"
 }

From 756b6fd3678344a5355e7d2fcc6ee0a83707e409 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 17:16:20 -0700
Subject: [PATCH 026/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index a7ea2897d6a..3fbfba7f818 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 3b402b759e1..c902e8db1ca 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index adcbaf04c78..e76aac0cfd5 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index a7ea2897d6a..3fbfba7f818 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 1533b8d9e56..7a967499afe 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 7f297784194..d73d15652c1 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 230d15095f9..8ddb7659602 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index dd1cf3af3b2..410f9cafc1b 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index d5bee892590..7b02f8f81a6 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c0a5cc59d3a12ff2ce70f9b028c3a9468e58a555"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 7d771a01a39d6900e5559848b92b505e4cdc06ba Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 17:21:09 -0700
Subject: [PATCH 027/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/b4273bddd6b1
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #20049 from etiennesegonzac/bug-992085-simple

Bug 992085 -  While swiping, enable user to remain in portrait mode when... r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/db1fd010f19d
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 992085 -  While swiping, enable user to remain in portrait mode when  a landscape app is encountered and vice versa.
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index ae0889e5dc0..c036c45abd5 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "02e1830c641fe10d272caa8ce228057557f86155", 
+    "revision": "b4273bddd6b1e43f59b7e9b694705cc4ec8f90c4", 
     "repo_path": "/integration/gaia-central"
 }

From 170404e0a73b33660d21df1cbae9fdb42192269f Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 17:26:31 -0700
Subject: [PATCH 028/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 3fbfba7f818..096ba633aa2 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index c902e8db1ca..40e7853074f 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index e76aac0cfd5..8924afb1578 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 3fbfba7f818..096ba633aa2 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 7a967499afe..2ee7ff1566d 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index d73d15652c1..9078e00bb49 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 8ddb7659602..3269b8b1b2f 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 410f9cafc1b..bfcb78043f7 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 7b02f8f81a6..f203cd72d98 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a44346be68f23782d6b24426ed085d62856f9273"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From dae1d8ea4d241d4383288cdd2d216ee7acadf5bf Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 17:51:08 -0700
Subject: [PATCH 029/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/429675e9e017
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #20055 from alivedise/bugzilla/1018836/skip-opening-for-immediate-animation

Bug 1018836 - Fix immediate transition issues r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/f64d6592110e
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 1018836 - Fix immediate transition issues
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index c036c45abd5..967d6b1f7ca 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "b4273bddd6b1e43f59b7e9b694705cc4ec8f90c4", 
+    "revision": "429675e9e0174075220358d652499fd893749594", 
     "repo_path": "/integration/gaia-central"
 }

From 816c004d0da113ffd02b04a890555b08eed4e68e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 17:53:10 -0700
Subject: [PATCH 030/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 096ba633aa2..a67ccf1a7b5 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 40e7853074f..62d381adf1c 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 8924afb1578..50882c28d99 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 096ba633aa2..a67ccf1a7b5 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 2ee7ff1566d..5ac8d59d1e0 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 9078e00bb49..7b90b3b54b8 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 3269b8b1b2f..55db4a74349 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index bfcb78043f7..1abdb0f063e 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index f203cd72d98..cfe8585260a 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cd1550ddfb3b95e1a06037f98779d6eb2423b6a8"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 345448d8d2f0eed97310ae078a7d7d1ce49f7fbf Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 18:46:16 -0700
Subject: [PATCH 031/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/fe6fc8ce56e4
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20112 from KevinGrandon/bug_1021282_vertical_wallpaper

Bug 1021282 - Change the Default Wallpaper to Illus_Flow2_Orange.jpg

========

https://hg.mozilla.org/integration/gaia-central/rev/7a350675da71
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1021282 - Change the Default Wallpaper to Illus_Flow2_Orange.jpg r=me
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 967d6b1f7ca..8b1db563f53 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "429675e9e0174075220358d652499fd893749594", 
+    "revision": "fe6fc8ce56e4f7a8eeb55a6ec2c48c1774909058", 
     "repo_path": "/integration/gaia-central"
 }

From e5ca86ddeab09576f2ce43ed3aae75a4a0b957fc Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 18:48:25 -0700
Subject: [PATCH 032/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index a67ccf1a7b5..5f291bee855 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 62d381adf1c..2c7fe627dbf 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 50882c28d99..fbd4b3912de 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index a67ccf1a7b5..5f291bee855 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 5ac8d59d1e0..6a2af95141f 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 7b90b3b54b8..57a072fb2df 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 55db4a74349..3a0d1f341fa 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 1abdb0f063e..0d98766e0ab 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index cfe8585260a..36867d644e9 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0130f0ebfd3deca45c1d5663332221020e698c57"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 03962a269f48cd3813c6e09f4d4adb21d2467681 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 19:01:06 -0700
Subject: [PATCH 033/103] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/61075b75c71b
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #20071 from yurenju/timeout

Bug 1013585 - Intermittent gaia-build "Automation Error: mozprocess time... r=testonly

========

https://hg.mozilla.org/integration/gaia-central/rev/fcb091e32ab5
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 1013585 - Intermittent gaia-build "Automation Error: mozprocess timed out after 330 seconds running ['make', 'build-test-integration', 'NPM_REGISTRY=http://npm-mirror.pub.build.mozilla.org', 'REPORTER=mocha-tbpl-reporter'] | timed out after 330 seconds of no output

========

https://hg.mozilla.org/integration/gaia-central/rev/a5a6dd8d69a0
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 1020475 - App install progress indicator + test infra for packaged app states r=kgrandon
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 8b1db563f53..1abd9f3a8af 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "fe6fc8ce56e4f7a8eeb55a6ec2c48c1774909058", 
+    "revision": "61075b75c71b765ce4d3906aa867a74baccc890d", 
     "repo_path": "/integration/gaia-central"
 }

From b62512507310f99ed7fe4edb2f8c76e243259628 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 19:06:32 -0700
Subject: [PATCH 034/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 5f291bee855..0960b17c119 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 2c7fe627dbf..da5d3baeac6 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index fbd4b3912de..805de0892ce 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 5f291bee855..0960b17c119 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 6a2af95141f..85d4f5c5614 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 57a072fb2df..6549e09a054 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 3a0d1f341fa..f52f4bb963b 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 0d98766e0ab..084c17e3283 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 36867d644e9..bb2bb9ddbfc 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e58eb0164d8b1d20a032aa7979c29bcbd50a0a22"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 6836907abb1f260ab70b2069ac19a65c57495c67 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 19:11:09 -0700
Subject: [PATCH 035/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/930e9ee90d32
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20090 from KevinGrandon/bug_1021121_vertical_icon_localization

Bug 1021121 - [Vertical] Home screen icons are not localized

========

https://hg.mozilla.org/integration/gaia-central/rev/19fea43caaec
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1021121 - [Vertical] Home screen icons are not localized r=lightsofapollo
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 1abd9f3a8af..3bebd07433f 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "61075b75c71b765ce4d3906aa867a74baccc890d", 
+    "revision": "930e9ee90d32497c01f8f3beea7415d0a8537c1c", 
     "repo_path": "/integration/gaia-central"
 }

From 1b4f0e36e72123b348454119034d069224179a43 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 19:13:12 -0700
Subject: [PATCH 036/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 0960b17c119..2ae9e81a621 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index da5d3baeac6..fdc8e59addd 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 805de0892ce..c7997d77090 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 0960b17c119..2ae9e81a621 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 85d4f5c5614..c69647ad57e 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 6549e09a054..86ecef49560 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index f52f4bb963b..0792837515d 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 084c17e3283..997d11f1be8 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index bb2bb9ddbfc..4e7cb4ef371 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="e654d48bdbea7e58693bc11e54b848aa8017b3ab"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From fdce4103b193803bc3a02c948a10636afa71963f Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 19:26:08 -0700
Subject: [PATCH 037/103] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/912ffe0ff9e2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1016239 - Follow-up, fix dedupe.js path r=me
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 3bebd07433f..57c6dc9da2f 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "930e9ee90d32497c01f8f3beea7415d0a8537c1c", 
+    "revision": "912ffe0ff9e23938449c15f0b5712653ccf48921", 
     "repo_path": "/integration/gaia-central"
 }

From 7af3a04ffd80049954e47572db55ff2214de4b68 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 19:31:34 -0700
Subject: [PATCH 038/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 2ae9e81a621..dc993dc0824 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index fdc8e59addd..17f7eed2e97 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index c7997d77090..2ea19216fcd 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 2ae9e81a621..dc993dc0824 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index c69647ad57e..a0728cb8275 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 86ecef49560..f994f2a6878 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 0792837515d..c3216ba07b9 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 997d11f1be8..50fabe2b997 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 4e7cb4ef371..78fc0af0a97 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8524b222d1a10ea90e583091eccedeea77ce924a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From c1dfbffd6b455d92e1c625a12948e36c371a059c Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 20:06:00 -0700
Subject: [PATCH 039/103] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/ed1ad1006f3d
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1021468 - [Vertical] Prevent app entering horizontal orientation r=me
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 57c6dc9da2f..aeaf98a121c 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "912ffe0ff9e23938449c15f0b5712653ccf48921", 
+    "revision": "ed1ad1006f3da91896a9a9205b56833fc6c6e720", 
     "repo_path": "/integration/gaia-central"
 }

From f50189ebe183c3606c2e07e9b3d800231858c076 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 20:11:24 -0700
Subject: [PATCH 040/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index dc993dc0824..77a849180cd 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 17f7eed2e97..7350d71617d 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 2ea19216fcd..0b2c8f676e9 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index dc993dc0824..77a849180cd 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index a0728cb8275..a28ecace015 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index f994f2a6878..8cb931a3eca 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index c3216ba07b9..f2d2a701de1 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 50fabe2b997..56dc72bdc50 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 78fc0af0a97..1111d02d8a0 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8f94479062343666d5fc1eb29af7e3dec4b2c4a7"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From ad3e3bb9fa3c7ea9d61619dcd64e2ba5b0f2b63b Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 20:21:09 -0700
Subject: [PATCH 041/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/19367dc6b0f9
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #19874 from pacorampas/call-screen-sprites

Bug 1018167 - [Dialer][Call Screen] Change iconpad's icon r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/d9925c84a5c1
Author: Paco Rampas <pacorampas@gmail.com>
Desc: Bug 1018167 - [Dialer][Call Screen] Change iconpad's icon
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index aeaf98a121c..d40f9be2b06 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "ed1ad1006f3da91896a9a9205b56833fc6c6e720", 
+    "revision": "19367dc6b0f9fe37cf3f9ca1a49fa12792e68af9", 
     "repo_path": "/integration/gaia-central"
 }

From ba95438acce74699406f6d5d52c63acc8487163d Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 20:26:39 -0700
Subject: [PATCH 042/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 77a849180cd..af883252bee 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 7350d71617d..a06c954e3d4 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 0b2c8f676e9..9241ca4f2c0 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 77a849180cd..af883252bee 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index a28ecace015..796fd02a4d0 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 8cb931a3eca..c2fd41bfb2e 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index f2d2a701de1..3c28278af37 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 56dc72bdc50..dd03ac10c99 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 1111d02d8a0..7ac53dcd732 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="678af023edbce557a7ee9289ff5d062413881e5b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 921d0a8c8a0f36a0f953cb7c10919613775b0899 Mon Sep 17 00:00:00 2001
From: Jamin Liu <jaliu@mozilla.com>
Date: Fri, 6 Jun 2014 11:38:24 +0800
Subject: [PATCH 043/103] Bug 968709 - Add a marionette test case to Bluetooth
 set to make sure the URL of Marionette client is correct. r=echou, f=vyang

Few marionette tests in unit-test set may navigate to specific URL and
wouldn't restore the URL of marionette client when the tests end.
Navigate the URL to default value before running Bluetooth test to make
sure the correctness of test.
---
 dom/bluetooth/tests/marionette/manifest.ini          |  1 +
 .../tests/marionette/test_navigate_to_default_url.py | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 dom/bluetooth/tests/marionette/test_navigate_to_default_url.py

diff --git a/dom/bluetooth/tests/marionette/manifest.ini b/dom/bluetooth/tests/marionette/manifest.ini
index 64819b7b9ce..1c7d4a90422 100644
--- a/dom/bluetooth/tests/marionette/manifest.ini
+++ b/dom/bluetooth/tests/marionette/manifest.ini
@@ -3,6 +3,7 @@ b2g = true
 browser = false
 qemu = true
 
+[test_navigate_to_default_url.py]
 [test_dom_BluetoothManager_enabled.js]
 [test_dom_BluetoothManager_adapteradded.js]
 [test_dom_BluetoothAdapter_setters.js]
diff --git a/dom/bluetooth/tests/marionette/test_navigate_to_default_url.py b/dom/bluetooth/tests/marionette/test_navigate_to_default_url.py
new file mode 100644
index 00000000000..34ad3635a24
--- /dev/null
+++ b/dom/bluetooth/tests/marionette/test_navigate_to_default_url.py
@@ -0,0 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from marionette_test import MarionetteTestCase
+
+class testNavigateToDefault(MarionetteTestCase):
+    def test_navigate_to_default_url(self):
+        try:
+            self.marionette.navigate("app://system.gaiamobile.org/index.html")
+        except:
+            self.assertTrue(Flase, "Can not navigate to system app.")

From 056d16c7ed97c0990bd824397efd8c5509fdeeb1 Mon Sep 17 00:00:00 2001
From: Jamin Liu <jaliu@mozilla.com>
Date: Fri, 6 Jun 2014 11:38:24 +0800
Subject: [PATCH 044/103] Bug 968709 - Add a marionette test for pairing APIs
 of BluetoothAdapter. r=echou, f=vyang

---
 dom/bluetooth/tests/marionette/head.js        | 304 ++++++++++++++----
 dom/bluetooth/tests/marionette/manifest.ini   |   1 +
 .../test_dom_BluetoothAdapter_discovery.js    |  14 +-
 .../test_dom_BluetoothAdapter_getters.js      |   4 +-
 .../test_dom_BluetoothAdapter_pair.js         |  66 ++++
 .../test_dom_BluetoothAdapter_setters.js      |   4 +-
 .../test_dom_BluetoothManager_adapteradded.js |   4 +-
 .../test_dom_BluetoothManager_enabled.js      |   4 +-
 8 files changed, 316 insertions(+), 85 deletions(-)
 create mode 100644 dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_pair.js

diff --git a/dom/bluetooth/tests/marionette/head.js b/dom/bluetooth/tests/marionette/head.js
index ae3a46fb1d3..d1afbfb5056 100644
--- a/dom/bluetooth/tests/marionette/head.js
+++ b/dom/bluetooth/tests/marionette/head.js
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 et filetype=javascript
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
@@ -36,7 +34,14 @@ const BDADDR_ALL   = "ff:ff:ff:ff:ff:ff";
 const BDADDR_LOCAL = "ff:ff:ff:00:00:00";
 
 // A user friendly name for remote BT device.
-const REMOTE_DEVICE_NAME = "Remote BT Device";
+const REMOTE_DEVICE_NAME = "Remote_BT_Device";
+
+// A system message signature of pairing request event
+const BT_PAIRING_REQ = "bluetooth-pairing-request";
+
+// Passkey and pincode used to reply pairing requst
+const BT_PAIRING_PASSKEY = 123456;
+const BT_PAIRING_PINCODE = "ABCDEFG";
 
 let Promise =
   SpecialPowers.Cu.import("resource://gre/modules/Promise.jsm").Promise;
@@ -80,6 +85,33 @@ function runEmulatorCmdSafe(aCommand) {
   return deferred.promise;
 }
 
+/**
+ * Wrap DOMRequest onsuccess/onerror events to Promise resolve/reject.
+ *
+ * Fulfill params: A DOMEvent.
+ * Reject params: A DOMEvent.
+ *
+ * @param aRequest
+ *        A DOMRequest instance.
+ *
+ * @return A deferred promise.
+ */
+function wrapDomRequestAsPromise(aRequest) {
+  let deferred = Promise.defer();
+
+  ok(aRequest instanceof DOMRequest,
+     "aRequest is instanceof " + aRequest.constructor);
+
+  aRequest.onsuccess = function(aEvent) {
+    deferred.resolve(aEvent);
+  };
+  aRequest.onerror = function(aEvent) {
+    deferred.reject(aEvent);
+  };
+
+  return deferred.promise;
+}
+
 /**
  * Add a Bluetooth remote device to scatternet and set its properties.
  *
@@ -188,13 +220,11 @@ function setEmulatorDeviceProperty(aAddress, aPropertyName, aValue) {
 function getEmulatorDeviceProperty(aAddress, aPropertyName) {
   let cmd = "bt property " + aAddress + " " + aPropertyName;
   return runEmulatorCmdSafe(cmd)
-    .then(function(aResults) {
-      return aResults[0];
-    });
+         .then(aResults => aResults[0]);
 }
 
 /**
- * Start dicovering Bluetooth devices.
+ * Start discovering Bluetooth devices.
  *
  * Allows the device's adapter to start seeking for remote devices.
  *
@@ -202,32 +232,28 @@ function getEmulatorDeviceProperty(aAddress, aPropertyName) {
  * Reject params: a DOMError
  *
  * @param aAdapter
- *        A BluetoothAdapter which is used to interact with local BT dev
+ *        A BluetoothAdapter which is used to interact with local BT device.
  *
  * @return A deferred promise.
  */
 function startDiscovery(aAdapter) {
-  let deferred = Promise.defer();
-
   let request = aAdapter.startDiscovery();
-  request.onsuccess = function () {
-    log("  Start discovery - Success");
-    // TODO (bug 892207): Make Bluetooth APIs available for 3rd party apps.
-    //     Currently, discovering state wouldn't change immediately here.
-    //     We would turn on this check when the redesigned API are landed.
-    // is(aAdapter.discovering, true, "BluetoothAdapter.discovering");
-    deferred.resolve();
-  }
-  request.onerror = function (aEvent) {
-    ok(false, "Start discovery - Fail");
-    deferred.reject(aEvent.target.error);
-  }
 
-  return deferred.promise;
+  return wrapDomRequestAsPromise(request)
+    .then(function resolve() {
+      // TODO (bug 892207): Make Bluetooth APIs available for 3rd party apps.
+      //     Currently, discovering state wouldn't change immediately here.
+      //     We would turn on this check when the redesigned API are landed.
+      // is(aAdapter.discovering, false, "BluetoothAdapter.discovering");
+      log("  Start discovery - Success");
+    }, function reject(aEvent) {
+      ok(false, "Start discovery - Fail");
+      throw aEvent.target.error;
+    });
 }
 
 /**
- * Stop dicovering Bluetooth devices.
+ * Stop discovering Bluetooth devices.
  *
  * Allows the device's adapter to stop seeking for remote devices.
  *
@@ -240,24 +266,184 @@ function startDiscovery(aAdapter) {
  * @return A deferred promise.
  */
 function stopDiscovery(aAdapter) {
+  let request = aAdapter.stopDiscovery();
+
+  return wrapDomRequestAsPromise(request)
+    .then(function resolve() {
+      // TODO (bug 892207): Make Bluetooth APIs available for 3rd party apps.
+      //     Currently, discovering state wouldn't change immediately here.
+      //     We would turn on this check when the redesigned API are landed.
+      // is(aAdapter.discovering, false, "BluetoothAdapter.discovering");
+      log("  Stop discovery - Success");
+    }, function reject(aEvent) {
+      ok(false, "Stop discovery - Fail");
+      throw aEvent.target.error;
+    });
+}
+
+/**
+ * Wait for 'devicefound' event of specified devices.
+ *
+ * Resolve if that every specified devices has been found.  Never reject.
+ *
+ * Fulfill params: an array which contains addresses of remote devices.
+ *
+ * @param aAdapter
+ *        A BluetoothAdapter which is used to interact with local BT device.
+ * @param aRemoteAddresses
+ *        An array which contains addresses of remote devices.
+ *
+ * @return A deferred promise.
+ */
+function waitForDevicesFound(aAdapter, aRemoteAddresses) {
   let deferred = Promise.defer();
 
-  let request = aAdapter.stopDiscovery();
-  request.onsuccess = function () {
-    log("  Stop discovery - Success");
-    // TODO (bug 892207): Make Bluetooth APIs available for 3rd party apps.
-    //     Currently, discovering state wouldn't change immediately here.
-    //     We would turn on this check when the redesigned API are landed.
-    // is(aAdapter.discovering, false, "BluetoothAdapter.discovering");
-    deferred.resolve();
-  }
-  request.onerror = function (aEvent) {
-    ok(false, "Stop discovery - Fail");
-    deferred.reject(aEvent.target.error);
-  }
+  var addrArray = [];
+  aAdapter.addEventListener("devicefound", function onevent(aEvent) {
+    if(aRemoteAddresses.indexOf(aEvent.device.address) != -1) {
+      addrArray.push(aEvent.device.address);
+    }
+    if(addrArray.length == aRemoteAddresses.length) {
+      aAdapter.removeEventListener("devicefound", onevent);
+      ok(true, "BluetoothAdapter has found all remote devices.");
+
+      deferred.resolve(addrArray);
+    }
+  });
+
   return deferred.promise;
 }
 
+/**
+ * Start discovering Bluetooth devices and wait for 'devicefound' events.
+ *
+ * Allows the device's adapter to start seeking for remote devices and wait for
+ * the 'devicefound' events of specified devices.
+ *
+ * Fulfill params: an array of addresses of found devices.
+ *
+ * @param aAdapter
+ *        A BluetoothAdapter which is used to interact with local BT device.
+ * @param aRemoteAddresses
+ *        An array which contains addresses of remote devices.
+ *
+ * @return A deferred promise.
+ */
+function startDiscoveryAndWaitDevicesFound(aAdapter, aRemoteAddresses) {
+  let promises = [];
+
+  promises.push(waitForDevicesFound(aAdapter, aRemoteAddresses));
+  promises.push(startDiscovery(aAdapter));
+  return Promise.all(promises)
+         .then(aResults => aResults[0]);
+}
+
+/**
+ * Start pairing a remote device.
+ *
+ * Start pairing a remote device with the device's adapter.
+ *
+ * Fulfill params: (none)
+ * Reject params: a DOMError
+ *
+ * @param aAdapter
+ *        A BluetoothAdapter which is used to interact with local BT device.
+ * @param aDeviceAddress
+ *        The string of remote Bluetooth address with format xx:xx:xx:xx:xx:xx.
+ *
+ * @return A deferred promise.
+ */
+function pair(aAdapter, aDeviceAddress) {
+  let request = aAdapter.pair(aDeviceAddress);
+
+  return wrapDomRequestAsPromise(request)
+    .then(function resolve() {
+      log("  Pair - Success");
+    }, function reject(aEvent) {
+      ok(false, "Pair - Fail");
+      throw aEvent.target.error;
+    });
+}
+
+/**
+ * Remove the paired device from the paired device list.
+ *
+ * Remove the paired device from the paired device list of the device's adapter.
+ *
+ * Fulfill params: (none)
+ * Reject params: a DOMError
+ *
+ * @param aAdapter
+ *        A BluetoothAdapter which is used to interact with local BT device.
+ * @param aDeviceAddress
+ *        The string of remote Bluetooth address with format xx:xx:xx:xx:xx:xx.
+ *
+ * @return A deferred promise.
+ */
+function unpair(aAdapter, aDeviceAddress) {
+  let request = aAdapter.unpair(aDeviceAddress);
+
+  return wrapDomRequestAsPromise(request)
+    .then(function resolve() {
+      log("  Unpair - Success");
+    }, function reject(aEvent) {
+      ok(false, "Unpair - Fail");
+      throw aEvent.target.error;
+    });
+}
+
+/**
+ * Start pairing a remote device and wait for "pairedstatuschanged" event.
+ *
+ * Start pairing a remote device with the device's adapter and wait for
+ * "pairedstatuschanged" event.
+ *
+ * Fulfill params:  an array of promise results contains the fulfilled params of
+ *                  'waitForAdapterEvent' and 'pair'.
+ *
+ * @param aAdapter
+ *        A BluetoothAdapter which is used to interact with local BT device.
+ * @param aDeviceAddress
+ *        The string of remote Bluetooth address with format xx:xx:xx:xx:xx:xx.
+ *
+ * @return A deferred promise.
+ */
+function pairDeviceAndWait(aAdapter, aDeviceAddress) {
+  let promises = [];
+  promises.push(waitForAdapterEvent(aAdapter, "pairedstatuschanged"));
+  promises.push(pair(aAdapter, aDeviceAddress));
+  return Promise.all(promises);
+}
+
+/**
+ * Get paried Bluetooth devices.
+ *
+ * The getPairedDevices method is used to retrieve the full list of all devices
+ * paired with the device's adapter.
+ *
+ * Fulfill params: a shallow copy of the Array of paired BluetoothDevice
+ *                 objects.
+ * Reject params: a DOMError
+ *
+ * @param aAdapter
+ *        A BluetoothAdapter which is used to interact with local BT device.
+ *
+ * @return A deferred promise.
+ */
+function getPairedDevices(aAdapter) {
+  let request = aAdapter.getPairedDevices();
+
+  return wrapDomRequestAsPromise(request)
+    .then(function resolve() {
+      log("  getPairedDevices - Success");
+      let pairedDevices = request.result.slice();
+      return pairedDevices;
+    }, function reject(aEvent) {
+      ok(false, "getPairedDevices - Fail");
+      throw aEvent.target.error;
+    });
+}
+
 /**
  * Get mozSettings value specified by @aKey.
  *
@@ -274,19 +460,16 @@ function stopDiscovery(aAdapter) {
  * @return A deferred promise.
  */
 function getSettings(aKey) {
-  let deferred = Promise.defer();
-
   let request = navigator.mozSettings.createLock().get(aKey);
-  request.addEventListener("success", function(aEvent) {
-    ok(true, "getSettings(" + aKey + ")");
-    deferred.resolve(aEvent.target.result[aKey]);
-  });
-  request.addEventListener("error", function() {
-    ok(false, "getSettings(" + aKey + ")");
-    deferred.reject();
-  });
 
-  return deferred.promise;
+  return wrapDomRequestAsPromise(request)
+    .then(function resolve(aEvent) {
+      ok(true, "getSettings(" + aKey + ")");
+      return aEvent.target.result[aKey];
+    }, function reject(aEvent) {
+      ok(false, "getSettings(" + aKey + ")");
+      throw aEvent.target.error;
+    });
 }
 
 /**
@@ -303,19 +486,15 @@ function getSettings(aKey) {
  * @return A deferred promise.
  */
 function setSettings(aSettings) {
-  let deferred = Promise.defer();
-
   let request = navigator.mozSettings.createLock().set(aSettings);
-  request.addEventListener("success", function() {
-    ok(true, "setSettings(" + JSON.stringify(aSettings) + ")");
-    deferred.resolve();
-  });
-  request.addEventListener("error", function() {
-    ok(false, "setSettings(" + JSON.stringify(aSettings) + ")");
-    deferred.reject();
-  });
 
-  return deferred.promise;
+  return wrapDomRequestAsPromise(request)
+    .then(function resolve() {
+      ok(true, "setSettings(" + JSON.stringify(aSettings) + ")");
+    }, function reject(aEvent) {
+      ok(false, "setSettings(" + JSON.stringify(aSettings) + ")");
+      throw aEvent.target.error;
+    });
 }
 
 /**
@@ -438,7 +617,7 @@ function waitForManagerEvent(aEventName) {
  * Fulfill params: the DOMEvent passed.
  *
  * @param aAdapter
- *        The BluetoothAdapter you want to use.
+ *        A BluetoothAdapter which is used to interact with local BT device.
  * @param aEventName
  *        The name of the EventHandler.
  *
@@ -463,7 +642,8 @@ function waitForAdapterEvent(aAdapter, aEventName) {
  *
  * Resolve if that named event occurs.  Reject if we can't set settings.
  *
- * Fulfill params: the DOMEvent passed.
+ * Fulfill params: an array of promise results contains the fulfill params of
+ *                 'waitForManagerEvent' and 'setBluetoothEnabled'.
  * Reject params: (none)
  *
  * @return A deferred promise.
diff --git a/dom/bluetooth/tests/marionette/manifest.ini b/dom/bluetooth/tests/marionette/manifest.ini
index 1c7d4a90422..f71c781f899 100644
--- a/dom/bluetooth/tests/marionette/manifest.ini
+++ b/dom/bluetooth/tests/marionette/manifest.ini
@@ -9,3 +9,4 @@ qemu = true
 [test_dom_BluetoothAdapter_setters.js]
 [test_dom_BluetoothAdapter_getters.js]
 [test_dom_BluetoothAdapter_discovery.js]
+[test_dom_BluetoothAdapter_pair.js]
diff --git a/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_discovery.js b/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_discovery.js
index 97ef81eb8e1..5440dcd0616 100644
--- a/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_discovery.js
+++ b/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_discovery.js
@@ -1,13 +1,11 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 et filetype=javascript
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ///////////////////////////////////////////////////////////////////////////////
 // Test Purpose:
 //   To verify that discovery process of BluetoothAdapter is correct.
-//   Use B2G emulator commands to add/remote remote devices to simulate
+//   Use B2G emulator commands to add/remove remote devices to simulate
 //   discovering behavior.
 //
 // Test Coverage:
@@ -24,15 +22,9 @@ MARIONETTE_HEAD_JS = 'head.js';
 startBluetoothTest(true, function testCaseMain(aAdapter) {
   log("Testing the discovery process of BluetoothAdapter ...");
 
-  // The properties of remote device.
-  let theProperties = {
-    "name": REMOTE_DEVICE_NAME,
-    "discoverable": true
-  };
-
   return Promise.resolve()
     .then(() => removeEmulatorRemoteDevice(BDADDR_ALL))
-    .then(() => addEmulatorRemoteDevice(/*theProperties*/ null))
+    .then(() => addEmulatorRemoteDevice(null))
     .then(function(aRemoteAddress) {
       let promises = [];
       promises.push(waitForAdapterEvent(aAdapter, "devicefound"));
diff --git a/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_getters.js b/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_getters.js
index 9abe13c657c..a32c47c356f 100644
--- a/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_getters.js
+++ b/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_getters.js
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 et filetype=javascript
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
diff --git a/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_pair.js b/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_pair.js
new file mode 100644
index 00000000000..7b681bc5112
--- /dev/null
+++ b/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_pair.js
@@ -0,0 +1,66 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+///////////////////////////////////////////////////////////////////////////////
+// Test Purpose:
+//   To verify that pairing process of BluetoothAdapter is correct.
+//   Use B2G emulator commands to add/remove remote devices to simulate
+//   discovering behavior. With current emulator implemation, the pair method
+//   between adapter and remote device would be 'confirmation'.
+//
+// Test Coverage:
+//   - BluetoothAdapter.startDiscovery()
+//   - BluetoothAdapter.stopDiscovery()
+//   - BluetoothAdapter.pair()
+//   - BluetoothAdapter.unpair()
+//   - BluetoothAdapter.onpairedstatuschanged()
+//   - BluetoothAdapter.setPairingConfirmation()
+//
+///////////////////////////////////////////////////////////////////////////////
+
+MARIONETTE_TIMEOUT = 60000;
+MARIONETTE_HEAD_JS = 'head.js';
+
+function replyPairingReq(aAdapter, aPairingEvent) {
+  switch (aPairingEvent.method) {
+    case 'confirmation':
+      log("The pairing passkey is " + aPairingEvent.passkey);
+      aAdapter.setPairingConfirmation(aPairingEvent.address, true);
+      break;
+    case 'pincode':
+      let pincode = BT_PAIRING_PINCODE;
+      aAdapter.setPinCode(aPairingEvent.address, pincode);
+      break;
+    case 'passkey':
+      let passkey = BT_PAIRING_PASSKEY;
+      aAdapter.setPasskey(aPairingEvent.address, passkey);
+      break;
+    default:
+      ok(false, "Unsupported pairing method. [" + aPairingEvent.method + "]");
+  }
+}
+
+startBluetoothTest(true, function testCaseMain(aAdapter) {
+  log("Testing the pairing process of BluetoothAdapter ...");
+
+  // listens to the system message BT_PAIRING_REQ
+  navigator.mozSetMessageHandler(BT_PAIRING_REQ,
+    (evt) => replyPairingReq(aAdapter, evt));
+
+  return Promise.resolve()
+    .then(() => removeEmulatorRemoteDevice(BDADDR_ALL))
+    .then(() => addEmulatorRemoteDevice())
+    .then((aRemoteAddress) =>
+          startDiscoveryAndWaitDevicesFound(aAdapter, [aRemoteAddress]))
+    .then((aRemoteAddresses) =>
+          stopDiscovery(aAdapter).then(() => aRemoteAddresses))
+    // 'aRemoteAddresses' is an arrary which contains addresses of discovered
+    // remote devices.
+    // Pairs with the first device in 'aRemoteAddresses' to test the functionality
+    // of BluetoothAdapter.pair and BluetoothAdapter.onpairedstatuschanged.
+    .then((aRemoteAddresses) => pairDeviceAndWait(aAdapter, aRemoteAddresses.pop()))
+    .then(() => getPairedDevices(aAdapter))
+    .then((aPairedDevices) => unpair(aAdapter, aPairedDevices.pop().address))
+    .then(() => removeEmulatorRemoteDevice(BDADDR_ALL));
+});
diff --git a/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_setters.js b/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_setters.js
index 5a08cacc010..867d77cf81b 100644
--- a/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_setters.js
+++ b/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_setters.js
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 et filetype=javascript
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
diff --git a/dom/bluetooth/tests/marionette/test_dom_BluetoothManager_adapteradded.js b/dom/bluetooth/tests/marionette/test_dom_BluetoothManager_adapteradded.js
index 034c1827715..eaa35050b32 100644
--- a/dom/bluetooth/tests/marionette/test_dom_BluetoothManager_adapteradded.js
+++ b/dom/bluetooth/tests/marionette/test_dom_BluetoothManager_adapteradded.js
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 et filetype=javascript
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
diff --git a/dom/bluetooth/tests/marionette/test_dom_BluetoothManager_enabled.js b/dom/bluetooth/tests/marionette/test_dom_BluetoothManager_enabled.js
index 005cbfcb248..120e4d113a1 100644
--- a/dom/bluetooth/tests/marionette/test_dom_BluetoothManager_enabled.js
+++ b/dom/bluetooth/tests/marionette/test_dom_BluetoothManager_enabled.js
@@ -1,6 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 et filetype=javascript
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 

From fbf34a8350da7ee5722edbbb970ff4a6a0f4f506 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 21:00:33 -0700
Subject: [PATCH 045/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/b859207fe404
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #19477 from steveck-chung/bug-1003820

Bug 1003820 - [Messages] Recipients container grows without limit breaking the layout. r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/72a245a5ab6f
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 1003820 - [Messages] Recipients container grows without limit breaking the layout
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index d40f9be2b06..12d984bf6be 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "19367dc6b0f9fe37cf3f9ca1a49fa12792e68af9", 
+    "revision": "b859207fe404cc5e045da8916871b37e7af07640", 
     "repo_path": "/integration/gaia-central"
 }

From 44b9ed73762ef43438000b8c835288b34a11bef6 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 21:06:22 -0700
Subject: [PATCH 046/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index af883252bee..9f540957af8 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index a06c954e3d4..6fbbf39161d 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 9241ca4f2c0..e9ad126643a 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index af883252bee..9f540957af8 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 796fd02a4d0..64ed6a8751c 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index c2fd41bfb2e..67258bc25e6 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 3c28278af37..cc037f162b5 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index dd03ac10c99..f8848e85be8 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 7ac53dcd732..700b3940908 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d7989db8af03c8a5e5b3fdd146dab5339d039555"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From c7c66495bb783c871ce704fc0f49b79aef716941 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 23:31:12 -0700
Subject: [PATCH 047/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/aed61c4d507f
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #20048 from snowmantw/issue1020728

Bug 1020728 - [System] Pre-launching LockScreen while the screen off

========

https://hg.mozilla.org/integration/gaia-central/rev/648a92bbf59e
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 1020728 - [System] Pre-launching LockScreen while the screen off
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 12d984bf6be..c9d0d0cc4b1 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "b859207fe404cc5e045da8916871b37e7af07640", 
+    "revision": "aed61c4d507fa2a92ab791a910cbd7fa55b2b00d", 
     "repo_path": "/integration/gaia-central"
 }

From a625bf890dccc82951f11972ac33fc4ea858fb0f Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 5 Jun 2014 23:36:37 -0700
Subject: [PATCH 048/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 9f540957af8..944ce4ec00e 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 6fbbf39161d..37e72e7982b 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index e9ad126643a..74ae420853c 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 9f540957af8..944ce4ec00e 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 64ed6a8751c..6e839d40d4b 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 67258bc25e6..fd958237198 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index cc037f162b5..a2feb7cdceb 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index f8848e85be8..533bc95332a 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 700b3940908..f77971b0832 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="902b0cdfec14dd578080e1eb318872943e6dec80"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 92f759d8e6b902a453e2a42773cdd8c56852bb1d Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 00:01:06 -0700
Subject: [PATCH 049/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/0940a7797002
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #20070 from crdlc/bug-1020155

Bug 1020155 - Populate collection datastore with data defined in pre_ins...

========

https://hg.mozilla.org/integration/gaia-central/rev/d047fa4b0884
Author: crdlc <crdlc@tid.es>
Desc: Bug 1020155 - Populate collection datastore with data defined in pre_installed_collections.json
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index c9d0d0cc4b1..f52bd3b3b9f 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "aed61c4d507fa2a92ab791a910cbd7fa55b2b00d", 
+    "revision": "0940a779700223f455cc9d5362eab09d96e8d442", 
     "repo_path": "/integration/gaia-central"
 }

From 9719791510c01a0e34f8ae1f00b36a833453275d Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 00:06:32 -0700
Subject: [PATCH 050/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 944ce4ec00e..72d01b6425c 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 37e72e7982b..e8fd553b02e 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 74ae420853c..465ebe14917 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 944ce4ec00e..72d01b6425c 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 6e839d40d4b..65629f865f4 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index fd958237198..239e500cd53 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index a2feb7cdceb..25fdf1ace7f 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 533bc95332a..7e4422b4e9e 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index f77971b0832..b1bb127ed6d 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1da81b75ea2b08d4f9bc695b8c0b536f094d736b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 1b8e5730919cb8b95ede2dddc81216ccc96a67b1 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 00:16:14 -0700
Subject: [PATCH 051/103] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/25f9411c7656
Author: viorelaioia <viorelaioia@gmail.com>
Desc: Merge pull request #20105 from dchunwong/fixcamera

Bug 1021034 - [flame] Investigate failure in test_camera_flash_modes.py

========

https://hg.mozilla.org/integration/gaia-central/rev/61ed086c8f99
Author: Dylan Chun Wong <d.chunwong@gmail.com>
Desc: Bug 1021034 - [flame] Investigate failure in test_camera_flash_modes.py

========

https://hg.mozilla.org/integration/gaia-central/rev/50f584cb3165
Author: viorelaioia <viorelaioia@gmail.com>
Desc: Merge pull request #20099 from dchunwong/fixgallery

Bug 1021027 - [Flame] Investigate failure in gallery tests

========

https://hg.mozilla.org/integration/gaia-central/rev/bf0a7c48effa
Author: Dylan Chun Wong <d.chunwong@gmail.com>
Desc: Bug 1021027 - [Flame] Investigate failure in gallery tests
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index f52bd3b3b9f..790dd9c2226 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "0940a779700223f455cc9d5362eab09d96e8d442", 
+    "revision": "25f9411c7656404c9956a54d6b87697ce3978259", 
     "repo_path": "/integration/gaia-central"
 }

From ef2c66010145d24484b90b095c515318191a6aaf Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 00:21:14 -0700
Subject: [PATCH 052/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 72d01b6425c..1d421a32b92 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index e8fd553b02e..622466cfb56 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 465ebe14917..d661340d34e 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 72d01b6425c..1d421a32b92 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 65629f865f4..a9d9741bf5e 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 239e500cd53..bb0feb8f532 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 25fdf1ace7f..96765abb812 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 7e4422b4e9e..adab731ba2a 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index b1bb127ed6d..11d7dfb0374 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="cdcc41972e853e2843ee06d850d7add706604d34"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From f4f7ac901e3a775146f6e3d1de7375df58183061 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 00:41:09 -0700
Subject: [PATCH 053/103] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

========

https://hg.mozilla.org/integration/gaia-central/rev/eea6a5ec9a70
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #19984 from DouglasSherk/1020140-phone-input

Bug 1020140 - [Visual Refresh][Dialer] Make phone number input field unselectable. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/d2532b563a8f
Author: DouglasSherk <github@sherk.me>
Desc: Bug 1020140 - [Visual Refresh][Dialer] Make phone number input field unselectable. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/1b11ed7be3e8
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Merge pull request #18641 from stasm/1000852-video-mozL10n.once

Bug 1000852 - Clean up bootstrap mozL10n API use in Video. r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/138e9e076f56
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 1000852 - Clean up bootstrap mozL10n API use in Video
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 790dd9c2226..0741c9f9c2e 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "25f9411c7656404c9956a54d6b87697ce3978259", 
+    "revision": "eea6a5ec9a7067f1a317f5c241aedfb90b447a9f", 
     "repo_path": "/integration/gaia-central"
 }

From 6789eb8eb3476097e83ce186019710efc91f9ba2 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 00:46:41 -0700
Subject: [PATCH 054/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 1d421a32b92..032a08dee9a 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 622466cfb56..e42edb0bd88 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index d661340d34e..21c0fab046f 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 1d421a32b92..032a08dee9a 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index a9d9741bf5e..2a9c2b5125f 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index bb0feb8f532..bec5912311e 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 96765abb812..e7ac299d585 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index adab731ba2a..0f1c50c2c51 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 11d7dfb0374..326dd8ac618 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a2ca14d69e149176fcd61eb03234cf999457e00c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From c36acface3fdc17a88d438b0ee0e14b1c8a6299d Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 00:56:07 -0700
Subject: [PATCH 055/103] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/d9eb271e0b0e
Author: Min-Zhong "John" Lu <mnjul@users.noreply.github.com>
Desc: Merge pull request #20115 from mnjul/bug_1021479_lockscreen_visual_arrow_size

Bug 1021479 - [VsD Refresh] Lockscreen Visual Refresh: Slider arrow size; r=gweng
Merged even though Travis didn't pass; the failing Marionette tests were expected to fail, see https://groups.google.com/forum/#!topic/mozilla.dev.gaia/JQeF6PrVlrw

========

https://hg.mozilla.org/integration/gaia-central/rev/f19a639e28f3
Author: John Lu [:mnjul] <jlu@mozilla.com>
Desc: Bug 1021479 - [VsD Refresh] Lockscreen Visual Refresh: Slider arrow size

========

https://hg.mozilla.org/integration/gaia-central/rev/a282c5349b37
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #19973 from alivedise/bugzilla/1016334_2.0/homescreen-activity-window-home-event

Bug 1016334 - Do not change url of homescreen if there is front window, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/1d49dea83d04
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 1016334 - Do not change url of homescreen if there is front window
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 0741c9f9c2e..ff05bec4760 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "eea6a5ec9a7067f1a317f5c241aedfb90b447a9f", 
+    "revision": "d9eb271e0b0e7804e1580498f1ceeaeef69c29c9", 
     "repo_path": "/integration/gaia-central"
 }

From 740eb01fa84081c9ddf1545dc0b1fd7e67200518 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 01:01:37 -0700
Subject: [PATCH 056/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 032a08dee9a..df8fec497ed 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index e42edb0bd88..2f9f787efb9 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 21c0fab046f..a495fd4c1a8 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 032a08dee9a..df8fec497ed 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 2a9c2b5125f..d45a1bc6cf8 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index bec5912311e..3775f92946b 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index e7ac299d585..136014cbbe9 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 0f1c50c2c51..3477b81bb85 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 326dd8ac618..d5f18c66399 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="45df99687b90af2a63e87d02fc4a7b4260885c0e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 04ed76f2eeb5f2bbed87c40d9858bc325c569168 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 01:18:18 -0700
Subject: [PATCH 057/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index df8fec497ed..4159bc99fb0 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -23,7 +23,7 @@
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
-  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="9100fa82fc355f5201e23e400fc6b40e875304ed"/>
+  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="fe08b63e807d9d0691241ecd9cda9f9998e19491"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
   <!-- Stock Android things -->
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index df8fec497ed..4159bc99fb0 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -23,7 +23,7 @@
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
-  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="9100fa82fc355f5201e23e400fc6b40e875304ed"/>
+  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="fe08b63e807d9d0691241ecd9cda9f9998e19491"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
   <!-- Stock Android things -->

From 3850cd5dbdf99a3ac46c51f6b4fa36cc866466a9 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 01:21:08 -0700
Subject: [PATCH 058/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/b33df7202f63
Author: lissyx <lissyx+github@lissyx.dyndns.org>
Desc: Merge pull request #19940 from lissyx/bug959195

Bug 959195 - Show user prompt on low battery before applying update r=etienne_s

========

https://hg.mozilla.org/integration/gaia-central/rev/1a599a3dbaee
Author: Alexandre Lissy <lissyx+github@lissyx.dyndns.org>
Desc: Bug 959195 - Show user prompt on low battery before applying update
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index ff05bec4760..a365decdd2a 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "d9eb271e0b0e7804e1580498f1ceeaeef69c29c9", 
+    "revision": "b33df7202f63c27346d09a854ee7faec8647d464", 
     "repo_path": "/integration/gaia-central"
 }

From 8039282729e4c9fa1938a804fdcb2f8a85ffba1e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 01:26:31 -0700
Subject: [PATCH 059/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 4 ++--
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 4 ++--
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 4159bc99fb0..8811deb0021 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,11 +19,11 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
-  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="fe08b63e807d9d0691241ecd9cda9f9998e19491"/>
+  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="a819a94a572c7b32556435491ed8eaab841a95ff"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
   <!-- Stock Android things -->
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 2f9f787efb9..f59d24fe40e 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index a495fd4c1a8..0673864aec4 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 4159bc99fb0..8811deb0021 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,11 +19,11 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
-  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="fe08b63e807d9d0691241ecd9cda9f9998e19491"/>
+  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="a819a94a572c7b32556435491ed8eaab841a95ff"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
   <!-- Stock Android things -->
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index d45a1bc6cf8..ff068b53f07 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 3775f92946b..cd6c56bb2b4 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 136014cbbe9..cee6b8264b5 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 3477b81bb85..e6b3eed7480 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index d5f18c66399..10310f9689a 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3133d37546e27f557e578a6ba1820dc954a5e383"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 0cda0de42648a634fc8c9a73eeb89af71b132e14 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 02:16:28 -0700
Subject: [PATCH 060/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c9704b92fb86
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #20073 from pacorampas/placeholder-message-1016541

Bug 1016541 - Thread and Composer. The input placeholder text (Message) should be italic. r=schung

========

https://hg.mozilla.org/integration/gaia-central/rev/f0920b816224
Author: Paco Rampas <pacorampas@gmail.com>
Desc: Bug 1016541 - Thread and Composer. The input placeholder text (Message) should be italic
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index a365decdd2a..16ed67e485e 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "b33df7202f63c27346d09a854ee7faec8647d464", 
+    "revision": "c9704b92fb86e8a8f654e1e7f93cccbc8aeb0f42", 
     "repo_path": "/integration/gaia-central"
 }

From a1dee1381b6fd7ec6550ca9d2c1fcfc5db1b401d Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 02:21:24 -0700
Subject: [PATCH 061/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 8811deb0021..8328ceb39a9 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index f59d24fe40e..4918ce2da2a 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 0673864aec4..80725e51d6f 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 8811deb0021..8328ceb39a9 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index ff068b53f07..395c9a07f75 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index cd6c56bb2b4..d76950f2e70 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index cee6b8264b5..8e203146875 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index e6b3eed7480..d89bfb6ff67 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 10310f9689a..e11e35dcdaf 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="c4a591b15bc0ddcc6e7262a3d11fa975aa9beedb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From ad7527561ddff911f3b0548d485f79560e2c5d25 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 02:46:18 -0700
Subject: [PATCH 062/103] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/70630498ae2c
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #19849 from timdream/input-manage-transition

Bug 1017327 - Isolate keyboard transition management to another module, r=rudyl

========

https://hg.mozilla.org/integration/gaia-central/rev/6147617245ac
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1017327 - (Part II) Let KeyboardManager use it

========

https://hg.mozilla.org/integration/gaia-central/rev/be5096ead476
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1017327 - (Part I) Implement InputAppsTransitionManager
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 16ed67e485e..e2cfc74e47e 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "c9704b92fb86e8a8f654e1e7f93cccbc8aeb0f42", 
+    "revision": "70630498ae2c7de7f4c31b6016b7d52e4018052c", 
     "repo_path": "/integration/gaia-central"
 }

From 18cb846a0a803e2964abfdcfff45d498ae346ff5 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 02:51:19 -0700
Subject: [PATCH 063/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 8328ceb39a9..cf9fff97d06 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 4918ce2da2a..b785d7c37b7 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 80725e51d6f..f2744b9bca4 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 8328ceb39a9..cf9fff97d06 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 395c9a07f75..5743928bf9f 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index d76950f2e70..e91dd9dcf90 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 8e203146875..33fdcd2d3b4 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index d89bfb6ff67..742a4969f15 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index e11e35dcdaf..b2489651bba 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="bd86b8d68389df7656fc426ea59995d7dfbfa1cb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From a69459ff3df28de16ca2cefd11d3782f96ed0e03 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 03:13:05 -0700
Subject: [PATCH 064/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-jb/sources.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index b785d7c37b7..54038ed0fb7 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -128,9 +128,9 @@
   <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="3a9a17613cc685aa232432566ad6cc607eab4ec1"/>
   <project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="c3ee0c875393607430086f942950d1b3f496ab0e"/>
   <project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="7d33aaf740bbf6c7c6e9c34a92b371eda311b66b"/>
-  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="0a2b7e94dce4989a3740fea6f6e3152978216c88"/>
+  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="cba8ebe395652e62a911d885cd6ac1bb4ad3ed57"/>
   <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="0e56e450367cd802241b27164a2979188242b95f"/>
-  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="dd94b2e17a146cb782d71933d25dcaa9c060e6ce"/>
+  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="832f4acaf481a19031e479a40b03d9ce5370ddee"/>
   <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="d0aa65b140a45016975ed0ecf35f280dd336e1d3"/>
   <project name="android-sdk" path="sdk" remote="b2g" revision="8b1365af38c9a653df97349ee53a3f5d64fd590a"/>
 </manifest>

From 900f727b3637dd8378da4dd93aa9a75f31860433 Mon Sep 17 00:00:00 2001
From: Eric Chou <echou@mozilla.com>
Date: Fri, 6 Jun 2014 18:14:22 +0800
Subject: [PATCH 065/103] Bug 1002391 - Get the latest SDP records of the
 target device, r=shuang

Use BlueZ API 'CreateDevice' to update the SDP records of those
unknown devices. On the other hand, still use 'DiscoverServices'
to update SDP records of paired devices.
---
 dom/bluetooth/bluez/BluetoothDBusService.cpp | 87 +++++++++++++++-----
 1 file changed, 67 insertions(+), 20 deletions(-)

diff --git a/dom/bluetooth/bluez/BluetoothDBusService.cpp b/dom/bluetooth/bluez/BluetoothDBusService.cpp
index aa65003aad7..167eae276cb 100644
--- a/dom/bluetooth/bluez/BluetoothDBusService.cpp
+++ b/dom/bluetooth/bluez/BluetoothDBusService.cpp
@@ -3436,14 +3436,13 @@ BluetoothDBusService::ToggleCalls(BluetoothReplyRunnable* aRunnable)
 class OnUpdateSdpRecordsRunnable : public nsRunnable
 {
 public:
-  OnUpdateSdpRecordsRunnable(const nsAString& aObjectPath,
+  OnUpdateSdpRecordsRunnable(const nsAString& aDeviceAddress,
                              BluetoothProfileManagerBase* aManager)
-    : mManager(aManager)
+    : mDeviceAddress(aDeviceAddress)
+    , mManager(aManager)
   {
-    MOZ_ASSERT(!aObjectPath.IsEmpty());
+    MOZ_ASSERT(!aDeviceAddress.IsEmpty());
     MOZ_ASSERT(aManager);
-
-    mDeviceAddress = GetAddressFromObjectPath(aObjectPath);
   }
 
   nsresult
@@ -3456,6 +3455,12 @@ public:
     return NS_OK;
   }
 
+  void
+  GetDeviceAddress(nsAString& aRetDeviceAddress)
+  {
+    aRetDeviceAddress = mDeviceAddress;
+  }
+
 private:
   nsString mDeviceAddress;
   BluetoothProfileManagerBase* mManager;
@@ -3641,31 +3646,74 @@ public:
     MOZ_ASSERT(sDBusConnection);
     MOZ_ASSERT(!sAdapterPath.IsEmpty());
 
-    const nsString objectPath =
-      GetObjectPathFromAddress(sAdapterPath, mDeviceAddress);
+    // We first guess that the device doesn't exist at all. So we use BlueZ
+    // API "CreateDevice" to create an object path for the BluetoothDevice
+    // object. "CreateDevice" will connect to the remote device and retrieve
+    // SDP records of the target.
+    NS_ConvertUTF16toUTF8 address(mDeviceAddress);
+    const char* cAddress = address.get();
 
     // I choose to use raw pointer here because this is going to be passed as an
     // argument into SendWithReply() at once.
     OnUpdateSdpRecordsRunnable* callbackRunnable =
-      new OnUpdateSdpRecordsRunnable(objectPath, mBluetoothProfileManager);
+      new OnUpdateSdpRecordsRunnable(mDeviceAddress, mBluetoothProfileManager);
 
-    sDBusConnection->SendWithReply(DiscoverServicesCallback,
-                                   (void*)callbackRunnable, -1,
-                                   BLUEZ_DBUS_BASE_IFC,
-                                   NS_ConvertUTF16toUTF8(objectPath).get(),
-                                   DBUS_DEVICE_IFACE,
-                                   "DiscoverServices",
-                                   DBUS_TYPE_STRING, &EmptyCString(),
-                                   DBUS_TYPE_INVALID);
+    sDBusConnection->SendWithReply(
+      CreateDeviceCallback, callbackRunnable, -1,
+      BLUEZ_DBUS_BASE_IFC,
+      NS_ConvertUTF16toUTF8(sAdapterPath).get(),
+      DBUS_ADAPTER_IFACE,
+      "CreateDevice",
+      DBUS_TYPE_STRING, &cAddress,
+      DBUS_TYPE_INVALID);
   }
 
 protected:
+  static void CreateDeviceCallback(DBusMessage* aMsg, void* aData)
+  {
+    MOZ_ASSERT(!NS_IsMainThread()); // I/O thread
+
+    nsAutoString errorString;
+    OnUpdateSdpRecordsRunnable* r =
+      static_cast<OnUpdateSdpRecordsRunnable*>(aData);
+
+    if (IsDBusMessageError(aMsg, nullptr, errorString)) {
+      // If the device already exists it comes here. If we want to refresh its
+      // SDP records then we have to do "DiscoverServices"
+      BT_LOGR("%s", NS_ConvertUTF16toUTF8(errorString).get());
+
+      nsString deviceAddress;
+      r->GetDeviceAddress(deviceAddress);
+
+      const nsString objectPath =
+        GetObjectPathFromAddress(sAdapterPath, deviceAddress);
+
+      sDBusConnection->SendWithReply(DiscoverServicesCallback,
+                                     aData, -1,
+                                     BLUEZ_DBUS_BASE_IFC,
+                                     NS_ConvertUTF16toUTF8(objectPath).get(),
+                                     DBUS_DEVICE_IFACE,
+                                     "DiscoverServices",
+                                     DBUS_TYPE_STRING, &EmptyCString(),
+                                     DBUS_TYPE_INVALID);
+      return;
+    }
+
+    NS_DispatchToMainThread(r);
+  }
+
   static void DiscoverServicesCallback(DBusMessage* aMsg, void* aData)
   {
     MOZ_ASSERT(!NS_IsMainThread()); // I/O thread
 
-    nsRefPtr<OnUpdateSdpRecordsRunnable> r(
-      static_cast<OnUpdateSdpRecordsRunnable*>(aData));
+    nsAutoString errorStr;
+
+    if (IsDBusMessageError(aMsg, nullptr, errorStr)) {
+      BT_LOGR("%s", NS_ConvertUTF16toUTF8(errorStr).get());
+    }
+
+    OnUpdateSdpRecordsRunnable* r =
+      static_cast<OnUpdateSdpRecordsRunnable*>(aData);
     NS_DispatchToMainThread(r);
   }
 
@@ -3680,8 +3728,7 @@ BluetoothDBusService::UpdateSdpRecords(const nsAString& aDeviceAddress,
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-  Task* task = new UpdateSdpRecordsTask(aDeviceAddress, aManager);
-  DispatchToDBusThread(task);
+  DispatchToDBusThread(new UpdateSdpRecordsTask(aDeviceAddress, aManager));
 
   return true;
 }

From 6e086b644f949eecf2d2f68b538245159ef7af16 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 03:28:07 -0700
Subject: [PATCH 066/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-jb/sources.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 54038ed0fb7..235cfa46de9 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -126,7 +126,7 @@
   <!-- Emulator specific things -->
   <project name="android-development" path="development" remote="b2g" revision="dab55669da8f48b6e57df95d5af9f16b4a87b0b1"/>
   <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="3a9a17613cc685aa232432566ad6cc607eab4ec1"/>
-  <project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="c3ee0c875393607430086f942950d1b3f496ab0e"/>
+  <project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="0e31f35a2a77301e91baa8a237aa9e9fa4076084"/>
   <project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="7d33aaf740bbf6c7c6e9c34a92b371eda311b66b"/>
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="cba8ebe395652e62a911d885cd6ac1bb4ad3ed57"/>
   <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="0e56e450367cd802241b27164a2979188242b95f"/>

From 811245589195eeadb35e7620768fe58db034c424 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 05:01:10 -0700
Subject: [PATCH 067/103] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

========

https://hg.mozilla.org/integration/gaia-central/rev/a54c3cd4cf91
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #19985 from Rik/flash-cancel-1019076

Bug 1019076 - Flash of Cancel button when opening Dialer r=drs

========

https://hg.mozilla.org/integration/gaia-central/rev/7e4aa353b348
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 1019076 - Flash of Cancel button when opening Dialer

========

https://hg.mozilla.org/integration/gaia-central/rev/e6b8d63eeb7b
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Merge pull request #20001 from stasm/1016026-qps-plocm-settings

Bug 1016026 - Add qps-plocm to the list of RTL locales in the Language panel. r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/058d601c76b0
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 1016026 - Add qps-plocm to the list of RTL locales in the Language panel. r=arthurcc
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index e2cfc74e47e..118daa7844d 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "70630498ae2c7de7f4c31b6016b7d52e4018052c", 
+    "revision": "a54c3cd4cf9154e20175fa7e8ac05f8d569993d5", 
     "repo_path": "/integration/gaia-central"
 }

From 5f33cf8a119b81d6ae24ed61245734e069d3f136 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 05:06:36 -0700
Subject: [PATCH 068/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index cf9fff97d06..1579965fbf4 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 235cfa46de9..478a239e68d 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index f2744b9bca4..1fd6db0cfd9 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index cf9fff97d06..1579965fbf4 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 5743928bf9f..c641b8f1648 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index e91dd9dcf90..4668f5ba9b7 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 33fdcd2d3b4..606ccca6eb0 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 742a4969f15..dee2069ccc0 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index b2489651bba..ef21be95811 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dfb4d047bfdf8a98d0aa57bd86c4c724d0a4e50f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 236e8091e50e820bbd36e49a70d97775dc87c3d9 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 05:41:12 -0700
Subject: [PATCH 069/103] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/d7535846f19d
Author: gitmai <mri@tid.es>
Desc: Merge pull request #20100 from gitmai/bug-1007590-CC-remove-balance-sms

Bug 1007590 - [Cost Control] Make Cost Control to remove balance and top...
r=salva

========

https://hg.mozilla.org/integration/gaia-central/rev/44c770cb1ed1
Author: mai <mri@tid.es>
Desc: Bug 1007590 - [Cost Control] Make Cost Control to remove balance and top-up SMS responses

========

https://hg.mozilla.org/integration/gaia-central/rev/0cd3c4c23e35
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #19949 from rnowm/power-modal-object

Bug 973827 - Power button modal should be an object menu instead of a custom implementation r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/81b25082bc79
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 973827 - Power button modal should be an object menu instead of a custom implementation

========

https://hg.mozilla.org/integration/gaia-central/rev/7de232eb5e82
Author: Albert <acperez@tid.es>
Desc: Merge pull request #19996 from acperez/bug-1020167

Bug 1020167: Add search engine configuration based on MCC/MNC

========

https://hg.mozilla.org/integration/gaia-central/rev/9848cad039b1
Author: Albert <acperez@tid.es>
Desc: Bug 1020167: Add search engine configuration based on MCC/MNC
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 118daa7844d..6feac5dc84a 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "a54c3cd4cf9154e20175fa7e8ac05f8d569993d5", 
+    "revision": "d7535846f19d63bd1fbee8cf348b80a0823e5fd1", 
     "repo_path": "/integration/gaia-central"
 }

From 27412e6b9ef944481a868589e2bab10393d50a58 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 05:46:22 -0700
Subject: [PATCH 070/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 1579965fbf4..40dab20ecc7 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 478a239e68d..4e64a69d063 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 1fd6db0cfd9..d0722e79188 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 1579965fbf4..40dab20ecc7 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index c641b8f1648..46600642f0e 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 4668f5ba9b7..dc89b5d1e00 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 606ccca6eb0..84b2e291f23 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index dee2069ccc0..56a4d96690a 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index ef21be95811..00ef7861a7f 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d5f13789f92116ea56c6bd1aed385be38bc1177a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 0d9975ba36d8f11d90d5cf640c855661c93a74ab Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 06:11:16 -0700
Subject: [PATCH 071/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/0ca66c85bb79
Author: BavarianTomcat <tomcat@mozilla.com>
Desc: Revert "Bug 1017327 - (Part I) Implement InputAppsTransitionManager" for breaking gaia ui tests

This reverts commit 3ebe122af79bc73da07b710af0d1fcf3d79601e7.

========

https://hg.mozilla.org/integration/gaia-central/rev/4960c4fc06e2
Author: BavarianTomcat <tomcat@mozilla.com>
Desc: Revert "Bug 1017327 - (Part II) Let KeyboardManager use it" for breaking gaia ui tests

This reverts commit 4ebaf831eb6ac05b34447e7d4c6e97adc2be1873.
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 6feac5dc84a..1ba9d65bcf7 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "d7535846f19d63bd1fbee8cf348b80a0823e5fd1", 
+    "revision": "0ca66c85bb79a9d6def44b839c307f8615fa71c6", 
     "repo_path": "/integration/gaia-central"
 }

From 5126531b3fbb69bec9804f15d0d28b765d691bc7 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 06:16:23 -0700
Subject: [PATCH 072/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 40dab20ecc7..3e7289fe6a6 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 4e64a69d063..4ef61e046b0 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index d0722e79188..5905d2ed44a 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 40dab20ecc7..3e7289fe6a6 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 46600642f0e..e8a5282a19b 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index dc89b5d1e00..c2b7c9667ae 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 84b2e291f23..c20e0fae55f 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 56a4d96690a..c19b0e6ebe0 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 00ef7861a7f..2a68cae4b7a 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fb61a3ba9296ead06db7af924f8c115e5a31f669"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 1f6d60e258df3384fd4fd221cc2bccdf79d0e70f Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 06:51:06 -0700
Subject: [PATCH 073/103] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/de2c586fd09a
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #20133 from vingtetun/multiple.attention.screen

Bug 988212 - Support multiple attention screens. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/77828358820c
Author: Vivien Nicolas <vnicolas@mozilla.com>
Desc: Bug 988212 - Support multiple attention screens. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/62f7b1d9b335
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Revert "Merge pull request #19943 from millermedeiros/1019617-week-view-am-pm"

This reverts commit 25ce8f290d921884e15f7559c0597f6b7efad419, reversing
changes made to d04b7196fb59834704ef38d400c813b7ea68d755.
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 1ba9d65bcf7..b85c2887008 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "0ca66c85bb79a9d6def44b839c307f8615fa71c6", 
+    "revision": "de2c586fd09a07a9d5f60527d2b54fea4432d22b", 
     "repo_path": "/integration/gaia-central"
 }

From 5e4ffade626f1d3c7cf0b38a9759082c3a84fb3d Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 06:56:31 -0700
Subject: [PATCH 074/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 3e7289fe6a6..9a5847ef74d 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 4ef61e046b0..03df2d58ef8 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 5905d2ed44a..234c2f5cdb2 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 3e7289fe6a6..9a5847ef74d 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index e8a5282a19b..a132e526814 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index c2b7c9667ae..e41c181e659 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index c20e0fae55f..2e0d557d086 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index c19b0e6ebe0..79dc4977be8 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 2a68cae4b7a..f8b5fe69755 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3b43bc39a5d3b3a078774c72d8f772617a481835"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From fd418c613e5e77be231831601b0097b84d3ff2cf Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 07:21:07 -0700
Subject: [PATCH 075/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c80f20c5b211
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #20075 from guilherme-pg/bug1002581-fmd-settings-enable-geolocation

Bug 1002581 - Include new strings for enabling geolocation for Find My D...

========

https://hg.mozilla.org/integration/gaia-central/rev/f4e00e07fa61
Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
Desc: Bug 1002581 - Include new strings for enabling geolocation for Find My Device.
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index b85c2887008..a2eae2e295a 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "de2c586fd09a07a9d5f60527d2b54fea4432d22b", 
+    "revision": "c80f20c5b2118dc03dc0584ca8cbafc0d23d481f", 
     "repo_path": "/integration/gaia-central"
 }

From 7f809c373b924ca5866c2b6574c9d8fab67f291b Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 07:26:31 -0700
Subject: [PATCH 076/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 9a5847ef74d..5d64aad6504 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 03df2d58ef8..df562cdba33 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 234c2f5cdb2..17d353a25b8 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 9a5847ef74d..5d64aad6504 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index a132e526814..d5df8d58cbc 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index e41c181e659..e7820ed9390 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 2e0d557d086..47249153d3e 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 79dc4977be8..8fd3d812721 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index f8b5fe69755..c1d5b380c70 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="487af01e7a373b77da231dcf5e96c59efa5f1904"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 9c6533f7cb7823ce79ed3be6f7735da77f48de0b Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 07:30:52 -0700
Subject: [PATCH 077/103] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/cd7cf4b5de65
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #20095 from kamituel/Bug_1019169_byte_str_conv_fix

Bug 1019169: Fixed UTF <-> Uint8Array conversions

========

https://hg.mozilla.org/integration/gaia-central/rev/7bfd5d6c6c8e
Author: Kamil Leszczuk <kamituel@gmail.com>
Desc: Bug 1019169: Fixed UTF <-> Uint8Array conversions

========

https://hg.mozilla.org/integration/gaia-central/rev/640987fa0fde
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #19951 from guilherme-pg/bug1017203-position-throttle

Bug 1017203 - Throttle rate of position updates for Find My Device.

========

https://hg.mozilla.org/integration/gaia-central/rev/b76042eabadb
Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
Desc: Bug 1017203 - Throttle rate of position updates for Find My Device.

========

https://hg.mozilla.org/integration/gaia-central/rev/afbeb40756b2
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #19780 from guilherme-pg/bug1014816-fmd-fxa-logout

Bug 1014816 - Keep Find My Device working while logged out of Firefox Accounts.

========

https://hg.mozilla.org/integration/gaia-central/rev/b0ed92f264b6
Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
Desc: Bug 1014816 - Keep Find My Device working while logged out of FxA.
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index a2eae2e295a..0efb80cafcd 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "c80f20c5b2118dc03dc0584ca8cbafc0d23d481f", 
+    "revision": "cd7cf4b5de6581f6381b14401adf92994221426a", 
     "repo_path": "/integration/gaia-central"
 }

From 884cf73fd4de5e4903727b8de902b419fe8a24c7 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 07:36:20 -0700
Subject: [PATCH 078/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 5d64aad6504..79c5ae47477 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index df562cdba33..3234be53a4d 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 17d353a25b8..748043a4711 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 5d64aad6504..79c5ae47477 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index d5df8d58cbc..d90d6af5f68 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index e7820ed9390..7c8b1c8b6aa 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 47249153d3e..e95a529069c 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 8fd3d812721..03ef605dcfe 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index c1d5b380c70..8d31342ee74 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4ed4acc905c4412e2db1829a83c576abadf72fb5"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From eb5c64f849d687254507be9b695e0d2345b88bcf Mon Sep 17 00:00:00 2001
From: John Shih <jshih@mozilla.com>
Date: Fri, 6 Jun 2014 17:12:54 +0800
Subject: [PATCH 079/103] Bug 1020758 - Disable Network Information API on
 Desktop. r=sicking

---
 modules/libpref/src/init/all.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 6ef2c63f532..9889fbd7283 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -3942,8 +3942,12 @@ pref("profiler.enabled", false);
 pref("profiler.interval", 10);
 pref("profiler.entries", 100000);
 
+#if defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID)
 // Network Information API
 pref("dom.netinfo.enabled", true);
+#else
+pref("dom.netinfo.enabled", false);
+#endif
 
 #ifdef XP_WIN
 // On 32-bit Windows, fire a low-memory notification if we have less than this

From 70877980299e4f638ccfe2d1c6b61b58b2986a86 Mon Sep 17 00:00:00 2001
From: "Bernardo P. Rittmeyer" <bernardo@rittme.com>
Date: Fri, 6 Jun 2014 07:47:00 -0400
Subject: [PATCH 080/103] Bug 1010402- Fix full block width of some hit areas
 in sync dialogs. r=mconley

---
 browser/base/content/sync/customize.xul | 41 +++++++++++++------------
 browser/components/preferences/sync.xul | 25 +++++++--------
 2 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/browser/base/content/sync/customize.xul b/browser/base/content/sync/customize.xul
index 87e66af085e..e1fd95107b1 100644
--- a/browser/base/content/sync/customize.xul
+++ b/browser/base/content/sync/customize.xul
@@ -38,25 +38,28 @@
 #endif
                  />
 
-    <checkbox label="&engine.tabs.label;"
-              accesskey="&engine.tabs.accesskey;"
-              preference="engine.tabs"/>
-    <checkbox label="&engine.bookmarks.label;"
-              accesskey="&engine.bookmarks.accesskey;"
-              preference="engine.bookmarks"/>
-    <checkbox id="fxa-pweng-chk"
-              label="&engine.passwords.label;"
-              accesskey="&engine.passwords.accesskey;"
-              preference="engine.passwords"/>
-    <checkbox label="&engine.history.label;"
-              accesskey="&engine.history.accesskey;"
-              preference="engine.history"/>
-    <checkbox label="&engine.addons.label;"
-              accesskey="&engine.addons.accesskey;"
-              preference="engine.addons"/>
-    <checkbox label="&engine.prefs.label;"
-              accesskey="&engine.prefs.accesskey;"
-              preference="engine.prefs"/>
+  <vbox align="start">
+      <checkbox label="&engine.tabs.label;"
+                accesskey="&engine.tabs.accesskey;"
+                preference="engine.tabs"/>
+      <checkbox label="&engine.bookmarks.label;"
+                accesskey="&engine.bookmarks.accesskey;"
+                preference="engine.bookmarks"/>
+      <checkbox id="fxa-pweng-chk"
+                label="&engine.passwords.label;"
+                accesskey="&engine.passwords.accesskey;"
+                preference="engine.passwords"/>
+      <checkbox label="&engine.history.label;"
+                accesskey="&engine.history.accesskey;"
+                preference="engine.history"/>
+      <checkbox label="&engine.addons.label;"
+                accesskey="&engine.addons.accesskey;"
+                preference="engine.addons"/>
+      <checkbox label="&engine.prefs.label;"
+                accesskey="&engine.prefs.accesskey;"
+                preference="engine.prefs"/>
+  </vbox>
+
   </prefpane>
 
   <script type="application/javascript"
diff --git a/browser/components/preferences/sync.xul b/browser/components/preferences/sync.xul
index 39ecbd6cddf..a88618794d4 100644
--- a/browser/components/preferences/sync.xul
+++ b/browser/components/preferences/sync.xul
@@ -185,18 +185,18 @@
           <spacer flex="1"/>
         </vbox>
 
-        <vbox id="noFxaAccount">
+        <vbox id="noFxaAccount" align="start">
           <label>&welcome.description;</label>
-          <label class="text-link"
-                 onclick="gSyncPane.signUp(); return false;"
-                 value="&welcome.createAccount.label;"/>
-          <label class="text-link"
-                 onclick="gSyncPane.signIn(); return false;"
-                 value="&welcome.signIn.label;"/>
-          <separator/>
-          <label class="text-link"
-                 onclick="gSyncPane.openOldSyncSupportPage(); return false;"
-                 value="&welcome.useOldSync.label;"/>
+            <label class="text-link"
+                   onclick="gSyncPane.signUp(); return false;"
+                   value="&welcome.createAccount.label;"/>
+            <label class="text-link"
+                   onclick="gSyncPane.signIn(); return false;"
+                   value="&welcome.signIn.label;"/>
+            <separator/>
+            <label class="text-link"
+                   onclick="gSyncPane.openOldSyncSupportPage(); return false;"
+                   value="&welcome.useOldSync.label;"/>
         </vbox>
 
         <vbox id="hasFxaAccount">
@@ -208,11 +208,12 @@
               <!-- logged in and verified and all is good -->
               <hbox>
                 <label id="fxaEmailAddress1"/>
-                <vbox flex="1">
+                <vbox>
                   <label class="text-link"
                          onclick="gSyncPane.manageFirefoxAccount();"
                          value="&manage.label;"/>
                 </vbox>
+                <spacer flex="1"/>
                 <vbox>
                   <button id="fxaUnlinkButton"
                           oncommand="gSyncPane.unlinkFirefoxAccount(true);"

From 9dc087f191f7e121ee7eab007b446f07fb0ad035 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 08:26:06 -0700
Subject: [PATCH 081/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/823d6fd1a645
Author: gitmai <mri@tid.es>
Desc: Merge pull request #20101 from gitmai/bug-973557-button-active-while-updating

Bug 973557 -[CostControl][FTU] Update button active while is updating in...
r=salva

========

https://hg.mozilla.org/integration/gaia-central/rev/ee474e2fefe2
Author: mai <mri@tid.es>
Desc: Bug 973557 -[CostControl][FTU] Update button active while is updating information
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 0efb80cafcd..f14dd9b85c0 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "cd7cf4b5de6581f6381b14401adf92994221426a", 
+    "revision": "823d6fd1a6451e2da8280297ea35978a7c16329e", 
     "repo_path": "/integration/gaia-central"
 }

From bb55cf727c17949004b5cc801e434bad5268a7b9 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 08:31:31 -0700
Subject: [PATCH 082/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 79c5ae47477..c538531dc32 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 3234be53a4d..6f632241d0c 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 748043a4711..898c9d31cbd 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 79c5ae47477..c538531dc32 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index d90d6af5f68..ffbe03fbee8 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 7c8b1c8b6aa..2b63b69137c 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index e95a529069c..10f9b955bc7 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 03ef605dcfe..c9a390f420b 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 8d31342ee74..6fb4205edf6 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d367579e0891b61b3b2310746e72f9db926624f7"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 209696c3f52ab6793b3f78bbf4dde9342c885596 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 08:41:10 -0700
Subject: [PATCH 083/103] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/a8a0fd61079b
Author: Ed Morley <emorley@mozilla.com>
Desc: Revert "Bug 990035 - Modify phone-sized tutorial to show vertical-scroll, notifications & sheets video" for intermittent failures in tutorial_test.js

This reverts commit fabeaffcc637780a490cfcca023aa33ee42041f4.
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index f14dd9b85c0..c5a02c5ca7b 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "823d6fd1a6451e2da8280297ea35978a7c16329e", 
+    "revision": "a8a0fd61079b056caa9725ce1227bbde12675aa8", 
     "repo_path": "/integration/gaia-central"
 }

From e0d3ee31c114afb54e8882af7ed032840e9a4cde Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 08:46:40 -0700
Subject: [PATCH 084/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index c538531dc32..b43e2dffd70 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 6f632241d0c..b37e3ecdb73 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 898c9d31cbd..b7f28603eab 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index c538531dc32..b43e2dffd70 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index ffbe03fbee8..1e90562a62c 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 2b63b69137c..03cdfee5721 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 10f9b955bc7..78ac2c022c1 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index c9a390f420b..e49cff7df6d 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 6fb4205edf6..23ab78b9711 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="86c019531ed0c1cb209aa8e4228dd2ea6539c15d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 8c59c7eb60535255d65b31dee066f8e4319b3215 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 08:55:40 -0700
Subject: [PATCH 085/103] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/324804537eae
Author: crdlc <crdlc@tid.es>
Desc: Bug 1021518 - [Vertical Homescreen] Hitting home button on lockscreen make the homescreen goes up after unlock r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/9e0f1747ae93
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #20043 from khuey/createListItemLeak

Bug 1020685: Close only over the URL string that we need. r=bfrancis

========

https://hg.mozilla.org/integration/gaia-central/rev/c18ea8366d17
Author: Kyle Huey <khuey@kylehuey.com>
Desc: Bug 1020685: Close only over the URL string that we need. r=bfrancis
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index c5a02c5ca7b..7278826102e 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "a8a0fd61079b056caa9725ce1227bbde12675aa8", 
+    "revision": "324804537eaeea6e9a3cbcd8cade0ef8561005a3", 
     "repo_path": "/integration/gaia-central"
 }

From 86fc4f8d4abe6044a67637ee416d8d4205baf198 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 08:58:10 -0700
Subject: [PATCH 086/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index b43e2dffd70..2025636cf8e 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index b37e3ecdb73..6cbb6db72ab 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index b7f28603eab..0c6eed466cd 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index b43e2dffd70..2025636cf8e 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 1e90562a62c..d0a59b3591c 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 03cdfee5721..ebb9b6a2695 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 78ac2c022c1..b40588263d0 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index e49cff7df6d..768452a0841 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 23ab78b9711..f1469083c53 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d98df93b7d4c060f19fc8bb0b1238a70012af15e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 1d2e8ac1e890b571430d27dbe9478f6bf8cd18fb Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 09:10:50 -0700
Subject: [PATCH 087/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/da07719e58b6
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Merge pull request #19965 from justindarc/bug1014955

Bug 1014955 - [Camera] Migrate v1.3T downsampling patches to v1.4/master

========

https://hg.mozilla.org/integration/gaia-central/rev/9e056b422ef5
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 1014955 - [Camera] Migrate v1.3T downsampling patches to v1.4/master
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 7278826102e..6533d71a316 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "324804537eaeea6e9a3cbcd8cade0ef8561005a3", 
+    "revision": "da07719e58b64abb358998e1fd5c8059b197f3cb", 
     "repo_path": "/integration/gaia-central"
 }

From 448e47a1caee6ba8df5b30d5d8b78c9744f81671 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 09:17:31 -0700
Subject: [PATCH 088/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 2025636cf8e..90fe7a06164 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 6cbb6db72ab..d40686802e2 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 0c6eed466cd..084825e6480 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 2025636cf8e..90fe7a06164 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index d0a59b3591c..db564e73795 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index ebb9b6a2695..06985a01d0e 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index b40588263d0..bf7e61a189b 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 768452a0841..ff06e27ac2e 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index f1469083c53..93d39445765 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7ba9b2f9c727f1021bd4e9b625cd381214002a98"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From f7cd74a9180f16709db6ab466ab51d9f8395d188 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 09:51:08 -0700
Subject: [PATCH 089/103] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/705337293d2a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1021781 - [Collections] Rename localized values to 'Smart Collections' r=me
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 6533d71a316..c58be2b5560 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "da07719e58b64abb358998e1fd5c8059b197f3cb", 
+    "revision": "705337293d2a5feaa720fd3bdb7adca0358cd6e8", 
     "repo_path": "/integration/gaia-central"
 }

From ab0f4b5176ee52bd8d53c54078e23302bac8af5f Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 09:56:13 -0700
Subject: [PATCH 090/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 90fe7a06164..3a06a9538d4 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index d40686802e2..21c24c182ed 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 084825e6480..8443ced92f6 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 90fe7a06164..3a06a9538d4 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index db564e73795..79ebddc8c55 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 06985a01d0e..ef3e85b94c4 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index bf7e61a189b..813d29e38dd 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index ff06e27ac2e..364bc130d02 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 93d39445765..0caa7532375 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From c7ab983e6a1e5c2c203b309c386aa4a813a826af Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 10:01:14 -0700
Subject: [PATCH 091/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/1a73e2fbac94
Author: Zibi Braniecki <zbigniew.braniecki@gmail.com>
Desc: Merge pull request #19966 from zbraniecki/1019970-connstate-l10n

Bug 1019970 - Clean up connstate l10n. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/b9bbb0f81b88
Author: Zbigniew Braniecki <gandalf@mozilla.com>
Desc: Bug 1019970 - Clean up connstate l10n
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index c58be2b5560..5f72860bdf6 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "705337293d2a5feaa720fd3bdb7adca0358cd6e8", 
+    "revision": "1a73e2fbac948c1151a2fa86db045147227fa7c0", 
     "repo_path": "/integration/gaia-central"
 }

From 8314bb4305fc04f8dffc0ebf5f3d708b0468854e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 10:06:15 -0700
Subject: [PATCH 092/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 3a06a9538d4..5e74ed09ec9 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 21c24c182ed..781d6dae450 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 8443ced92f6..7a6b84f1550 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 3a06a9538d4..5e74ed09ec9 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 79ebddc8c55..ad4fdc8b8c2 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index ef3e85b94c4..dcb66c44613 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 813d29e38dd..cc739dc1ac2 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 364bc130d02..43d4f0b7422 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 0caa7532375..540067fa7ce 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fe3ec8b600f3db17284dd3d48869faa9194051d2"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 498f99af0b7bbea2d6b6edd2bb7246f647d4d3b7 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Fri, 6 Jun 2014 18:14:43 +0100
Subject: [PATCH 093/103] Backed out changeset e982377e39a3 (bug 960897) since
 the new test_touchcaret.py intermittently fails

---
 layout/base/tests/marionette/manifest.ini     |  15 -
 .../base/tests/marionette/test_touchcaret.py  | 339 ------------------
 .../client/marionette/tests/unit-tests.ini    |   3 -
 .../marionette/www/test_touchcaret.html       |  17 -
 4 files changed, 374 deletions(-)
 delete mode 100644 layout/base/tests/marionette/manifest.ini
 delete mode 100644 layout/base/tests/marionette/test_touchcaret.py
 delete mode 100644 testing/marionette/client/marionette/www/test_touchcaret.html

diff --git a/layout/base/tests/marionette/manifest.ini b/layout/base/tests/marionette/manifest.ini
deleted file mode 100644
index caf0e5943ab..00000000000
--- a/layout/base/tests/marionette/manifest.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[DEFAULT]
-; true if the test requires an emulator, otherwise false
-qemu = false
-
-; true if the test is compatible with the browser, otherwise false
-browser = true
-
-; true if the test is compatible with b2g, otherwise false
-b2g = true
-
-; true if the test should be skipped
-skip = false
-
-[test_touchcaret.py]
-b2g = false ; Bug 1020261
diff --git a/layout/base/tests/marionette/test_touchcaret.py b/layout/base/tests/marionette/test_touchcaret.py
deleted file mode 100644
index 2525f8b3e97..00000000000
--- a/layout/base/tests/marionette/test_touchcaret.py
+++ /dev/null
@@ -1,339 +0,0 @@
-# -*- coding: utf-8 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import string
-
-from by import By
-from marionette import Actions
-from marionette_test import MarionetteTestCase
-
-
-class TouchCaretTest(MarionetteTestCase):
-    _input_selector = (By.ID, 'input')
-    _textarea_selector = (By.ID, 'textarea')
-    _contenteditable_selector = (By.ID, 'contenteditable')
-
-    def setUp(self):
-        # Code to execute before a tests are run.
-        MarionetteTestCase.setUp(self)
-        self.actions = Actions(self.marionette)
-
-    def openTestHtml(self, enabled=True):
-        '''Open html for testing and locate elements, and enable/disable touch
-        caret.'''
-        self.marionette.execute_script(
-            'SpecialPowers.setBoolPref("touchcaret.enabled", %s);' %
-            ('true' if enabled else 'false'))
-
-        test_html = self.marionette.absolute_url('test_touchcaret.html')
-        self.marionette.navigate(test_html)
-
-        self._input = self.marionette.find_element(*self._input_selector)
-        self._textarea = self.marionette.find_element(*self._textarea_selector)
-        self._contenteditable = self.marionette.find_element(*self._contenteditable_selector)
-
-    def is_input_or_textarea(self, element):
-        '''Return True if element is either <input> or <textarea>'''
-        return element.tag_name in ('input', 'textarea')
-
-    def get_js_selection_cmd(self, element):
-        '''Return a command snippet to get selection object.
-
-        If the element is <input> or <textarea>, return the selection object
-        associated with it. Otherwise, return the current selection object.
-
-        Note: "element" must be provided as the first argument to
-        execute_script().
-
-        '''
-        if self.is_input_or_textarea(element):
-            # We must unwrap sel so that DOMRect could be returned to Python
-            # side.
-            return '''var sel = SpecialPowers.wrap(arguments[0]).editor.selection;
-                   sel = SpecialPowers.unwrap(sel);'''
-        else:
-            return '''var sel = window.getSelection();'''
-
-    def caret_rect(self, element):
-        '''Return the caret's DOMRect object.
-
-        If the element is either <input> or <textarea>, return the caret's
-        DOMRect within the element. Otherwise, return the DOMRect of the
-        current selected caret.
-
-        '''
-        cmd = self.get_js_selection_cmd(element) +\
-            '''return sel.getRangeAt(0).getClientRects()[0];'''
-        return self.marionette.execute_script(cmd, script_args=[element])
-
-    def caret_location(self, element):
-        '''Return caret's center location by the number of characters offset
-        within the given element.
-
-        Return (x, y) coordinates of the caret's center by the number of
-        characters offset relative to the top left-hand corner of the given
-        element.
-
-        '''
-        rect = self.caret_rect(element)
-        x = rect['left'] + rect['width'] / 2.0 - element.location['x']
-        y = rect['top'] + rect['height'] / 2.0 - element.location['y']
-        return x, y
-
-    def touch_caret_location(self, element):
-        '''Return touch caret's location (based on current caret location).
-
-        Return (x, y) coordinates of the touch caret's tip relative to the top
-        left-hand corner of the given element.
-
-        '''
-        rect = self.caret_rect(element)
-        x = rect['left'] - element.location['x']
-
-        # Touch caret's tip is below the bottom of the caret. Add 5px to y
-        # should be sufficient to locate it.
-        y = rect['bottom'] + 5 - element.location['y']
-
-        return x, y
-
-    def move_caret_by_offset(self, element, offset, backward=False):
-        '''Move caret in the element by offset.'''
-        cmd = self.get_js_selection_cmd(element) +\
-            '''sel.modify("move", arguments[1], "character");'''
-        direction = 'backward' if backward else 'forward'
-
-        for i in range(offset):
-            self.marionette.execute_script(
-                cmd, script_args=[element, direction])
-
-    def move_caret_to_front(self, element):
-        if self.is_input_or_textarea(element):
-            cmd = '''arguments[0].setSelectionRange(0, 0);'''
-        else:
-            cmd = '''var sel = window.getSelection();
-                  sel.collapse(arguments[0].firstChild, 0);'''
-
-        self.marionette.execute_script(cmd, script_args=[element])
-
-    def move_caret_to_end(self, element):
-        if self.is_input_or_textarea(element):
-            cmd = '''var len = arguments[0].value.length;
-                  arguments[0].setSelectionRange(len, len);'''
-        else:
-            cmd = '''var sel = window.getSelection();
-                  sel.collapse(arguments[0].lastChild, arguments[0].lastChild.length);'''
-
-        self.marionette.execute_script(cmd, script_args=[element])
-
-    def get_content(self, element):
-        '''Return the content of the element.'''
-        if self.is_input_or_textarea(element):
-            return element.get_attribute('value')
-        else:
-            return element.text
-
-    def _test_move_caret_to_the_right_by_one_character(self, el, assertFunc):
-        content_to_add = '!'
-        target_content = self.get_content(el)
-        target_content = target_content[:1] + content_to_add + target_content[1:]
-
-        # Get touch caret (x, y) at position 1 and 2.
-        self.move_caret_to_front(el)
-        caret0_x, caret0_y = self.caret_location(el)
-        touch_caret0_x, touch_caret0_y = self.touch_caret_location(el)
-        self.move_caret_by_offset(el, 1)
-        touch_caret1_x, touch_caret1_y = self.touch_caret_location(el)
-
-        # Tap the front of the input to make touch caret appear.
-        el.tap(caret0_x, caret0_y)
-
-        # Move touch caret
-        self.actions.flick(el, touch_caret0_x, touch_caret0_y,
-                           touch_caret1_x, touch_caret1_y).perform()
-
-        el.send_keys(content_to_add)
-        assertFunc(target_content, self.get_content(el))
-
-    def _test_move_caret_to_end_by_dragging_touch_caret_to_bottom_right_corner(self, el, assertFunc):
-        content_to_add = '!'
-        target_content = self.get_content(el) + content_to_add
-
-        # Tap the front of the input to make touch caret appear.
-        self.move_caret_to_front(el)
-        el.tap(*self.caret_location(el))
-
-        # Move touch caret to the bottom-right corner of the element.
-        src_x, src_y = self.touch_caret_location(el)
-        dest_x, dest_y = el.size['width'], el.size['height']
-        self.actions.flick(el, src_x, src_y, dest_x, dest_y).perform()
-
-        el.send_keys(content_to_add)
-        assertFunc(target_content, self.get_content(el))
-
-    def _test_move_caret_to_front_by_dragging_touch_caret_to_top_left_corner(self, el, assertFunc):
-        content_to_add = '!'
-        target_content = content_to_add + self.get_content(el)
-
-        # Tap to make touch caret appear. Note: it's strange that when the caret
-        # is at the end, the rect of the caret in <textarea> cannot be obtained.
-        # A bug perhaps.
-        self.move_caret_to_end(el)
-        self.move_caret_by_offset(el, 1, backward=True)
-        el.tap(*self.caret_location(el))
-
-        # Move touch caret to the top-left corner of the input box.
-        src_x, src_y = self.touch_caret_location(el)
-        dest_x, dest_y = 0, 0
-        self.actions.flick(el, src_x, src_y, dest_x, dest_y).perform()
-
-        el.send_keys(content_to_add)
-        assertFunc(target_content, self.get_content(el))
-
-    def _test_touch_caret_timeout_by_dragging_it_to_top_left_corner_after_timout(self, el, assertFunc):
-        content_to_add = '!'
-        non_target_content = content_to_add + self.get_content(el)
-
-        # Get touch caret timeout in millisecond, and convert it to second.
-        timeout = self.marionette.execute_script(
-            'return SpecialPowers.getIntPref("touchcaret.expiration.time");')
-        timeout /= 1000.0
-
-        # Tap to make touch caret appear. Note: it's strange that when the caret
-        # is at the end, the rect of the caret in <textarea> cannot be obtained.
-        # A bug perhaps.
-        self.move_caret_to_end(el)
-        self.move_caret_by_offset(el, 1, backward=True)
-        el.tap(*self.caret_location(el))
-
-        # Wait until touch caret disappears, then pretend to move it to the
-        # top-left corner of the input box.
-        src_x, src_y = self.touch_caret_location(el)
-        dest_x, dest_y = 0, 0
-        self.actions.wait(timeout).flick(el, src_x, src_y, dest_x, dest_y).perform()
-
-        el.send_keys(content_to_add)
-        assertFunc(non_target_content, self.get_content(el))
-
-    def _test_scroll_by_dragging_touch_caret_to_bottom_right_corner(self, el, assertFunc):
-        content_to_add = '!'
-        target_content = string.ascii_letters + content_to_add
-
-        # Insert a long string to test horizontal scrolling.
-        el.clear()
-        el.send_keys(string.ascii_letters)
-
-        # Tap to make touch caret appear.
-        el.tap()
-
-        # Move touch caret to 100px right to the bottom-right corner of the input
-        # box so that it could scroll faster.
-        src_x, src_y = self.touch_caret_location(el)
-        dest_x, dest_y = el.size['width'] + 100, el.size['height']
-        self.actions.flick(el, src_x, src_y, dest_x, dest_y).perform()
-
-        el.send_keys(content_to_add)
-        assertFunc(target_content, self.get_content(el))
-
-    ########################################################################
-    # <input> test cases with touch caret enabled
-    ########################################################################
-    def test_input_move_caret_to_the_right_by_one_character(self):
-        self.openTestHtml(enabled=True)
-        self._test_move_caret_to_the_right_by_one_character(self._input, self.assertEqual)
-
-    def test_input_move_caret_to_end_by_dragging_touch_caret_to_bottom_right_corner(self):
-        self.openTestHtml(enabled=True)
-        self._test_move_caret_to_end_by_dragging_touch_caret_to_bottom_right_corner(self._input, self.assertEqual)
-
-    def test_input_move_caret_to_front_by_dragging_touch_caret_to_top_left_corner(self):
-        self.openTestHtml(enabled=True)
-        self._test_move_caret_to_front_by_dragging_touch_caret_to_top_left_corner(self._input, self.assertEqual)
-
-    def test_input_touch_caret_timeout(self):
-        self.openTestHtml(enabled=True)
-        self._test_touch_caret_timeout_by_dragging_it_to_top_left_corner_after_timout(self._input, self.assertNotEqual)
-
-    def test_input_scroll_by_dragging_touch_caret_to_bottom_right_corner(self):
-        self.openTestHtml(enabled=True)
-        self._test_scroll_by_dragging_touch_caret_to_bottom_right_corner(self._input, self.assertEqual)
-
-    ########################################################################
-    # <input> test cases with touch caret disabled
-    ########################################################################
-    def test_input_move_caret_to_the_right_by_one_character_disabled(self):
-        self.openTestHtml(enabled=False)
-        self._test_move_caret_to_the_right_by_one_character(self._input, self.assertNotEqual)
-
-    def test_input_move_caret_to_front_by_dragging_touch_caret_to_top_left_corner_disabled(self):
-        self.openTestHtml(enabled=False)
-        self._test_move_caret_to_front_by_dragging_touch_caret_to_top_left_corner(self._input, self.assertNotEqual)
-
-    ########################################################################
-    # <textarea> test cases with touch caret enabled
-    ########################################################################
-    def test_textarea_move_caret_to_the_right_by_one_character(self):
-        self.openTestHtml(enabled=True)
-        self._test_move_caret_to_the_right_by_one_character(self._textarea, self.assertEqual)
-
-    def test_textarea_move_caret_to_end_by_dragging_touch_caret_to_bottom_right_corner(self):
-        self.openTestHtml(enabled=True)
-        self._test_move_caret_to_end_by_dragging_touch_caret_to_bottom_right_corner(self._textarea, self.assertEqual)
-
-    def test_textarea_move_caret_to_front_by_dragging_touch_caret_to_top_left_corner(self):
-        self.openTestHtml(enabled=True)
-        self._test_move_caret_to_front_by_dragging_touch_caret_to_top_left_corner(self._textarea, self.assertEqual)
-
-    def test_textarea_touch_caret_timeout(self):
-        self.openTestHtml(enabled=True)
-        self._test_touch_caret_timeout_by_dragging_it_to_top_left_corner_after_timout(self._textarea, self.assertNotEqual)
-
-    def test_textarea_scroll_by_dragging_touch_caret_to_bottom_right_corner(self):
-        self.openTestHtml(enabled=True)
-        self._test_scroll_by_dragging_touch_caret_to_bottom_right_corner(self._textarea, self.assertEqual)
-
-    ########################################################################
-    # <textarea> test cases with touch caret disabled
-    ########################################################################
-    def test_textarea_move_caret_to_the_right_by_one_character_disabled(self):
-        self.openTestHtml(enabled=False)
-        self._test_move_caret_to_the_right_by_one_character(self._textarea, self.assertNotEqual)
-
-    def test_textarea_move_caret_to_front_by_dragging_touch_caret_to_top_left_corner_disabled(self):
-        self.openTestHtml(enabled=False)
-        self._test_move_caret_to_front_by_dragging_touch_caret_to_top_left_corner(self._textarea, self.assertNotEqual)
-
-    ########################################################################
-    # <div> contenteditable test cases with touch caret enabled
-    ########################################################################
-    def test_contenteditable_move_caret_to_the_right_by_one_character(self):
-        self.openTestHtml(enabled=True)
-        self._test_move_caret_to_the_right_by_one_character(self._contenteditable, self.assertEqual)
-
-    def test_contenteditable_move_caret_to_end_by_dragging_touch_caret_to_bottom_right_corner(self):
-        self.openTestHtml(enabled=True)
-        self._test_move_caret_to_end_by_dragging_touch_caret_to_bottom_right_corner(self._contenteditable, self.assertEqual)
-
-    def test_contenteditable_move_caret_to_front_by_dragging_touch_caret_to_top_left_corner(self):
-        self.openTestHtml(enabled=True)
-        self._test_move_caret_to_front_by_dragging_touch_caret_to_top_left_corner(self._contenteditable, self.assertEqual)
-
-    def test_contenteditable_touch_caret_timeout(self):
-        self.openTestHtml(enabled=True)
-        self._test_touch_caret_timeout_by_dragging_it_to_top_left_corner_after_timout(self._contenteditable, self.assertNotEqual)
-
-    def test_contenteditable_scroll_by_dragging_touch_caret_to_bottom_right_corner(self):
-        self.openTestHtml(enabled=True)
-        self._test_scroll_by_dragging_touch_caret_to_bottom_right_corner(self._contenteditable, self.assertEqual)
-
-    ########################################################################
-    # <div> contenteditable test cases with touch caret disabled
-    ########################################################################
-    def test_contenteditable_move_caret_to_the_right_by_one_character_disabled(self):
-        self.openTestHtml(enabled=False)
-        self._test_move_caret_to_the_right_by_one_character(self._contenteditable, self.assertNotEqual)
-
-    def test_contenteditable_move_caret_to_front_by_dragging_touch_caret_to_top_left_corner_disabled(self):
-        self.openTestHtml(enabled=False)
-        self._test_move_caret_to_front_by_dragging_touch_caret_to_top_left_corner(self._contenteditable, self.assertNotEqual)
diff --git a/testing/marionette/client/marionette/tests/unit-tests.ini b/testing/marionette/client/marionette/tests/unit-tests.ini
index 5f0768bfc27..9174d6c47fd 100644
--- a/testing/marionette/client/marionette/tests/unit-tests.ini
+++ b/testing/marionette/client/marionette/tests/unit-tests.ini
@@ -27,6 +27,3 @@ skip = false
 [include:../../../../../dom/nfc/tests/marionette/manifest.ini]
 [include:../../../../../dom/events/test/marionette/manifest.ini]
 [include:../../../../../dom/wifi/test/marionette/manifest.ini]
-
-; layout tests
-[include:../../../../../layout/base/tests/marionette/manifest.ini]
diff --git a/testing/marionette/client/marionette/www/test_touchcaret.html b/testing/marionette/client/marionette/www/test_touchcaret.html
deleted file mode 100644
index 24887704ecd..00000000000
--- a/testing/marionette/client/marionette/www/test_touchcaret.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!DOCTYPE html>
-<html id="html">
-  <head>
-    <title>Bug 960897: Marionette tests for touch caret</title>
-  </head>
-  <body>
-    <div><input id="input" value="ABCDEFGHI"></input></div>
-    <br />
-    <div><textarea name="textarea" id="textarea" rows="4" cols="6">ABCDEFGHI</textarea></div>
-    <br />
-    <div style="width: 10em; height: 2em; word-wrap: break-word; overflow: auto;" contenteditable="true" id="contenteditable">ABCDEFGHI</div>
-  </body>
-</html>

From dc77436a5d9d8cbcc315e5180249397693354cad Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 10:46:12 -0700
Subject: [PATCH 094/103] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/b8a669ee022f
Author: crdlc <crdlc@tid.es>
Desc: Bug 1020755 - (vertical-homescreen) Status bar should become 100% opaque when user scrolls r=alive r=kgrandon
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 5f72860bdf6..3c87445aab3 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "1a73e2fbac948c1151a2fa86db045147227fa7c0", 
+    "revision": "b8a669ee022fc969ec2e2fd8fc10575d14364bcb", 
     "repo_path": "/integration/gaia-central"
 }

From 8d825fa26acf335c477ac6bb73aa01a969a3503d Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 10:51:36 -0700
Subject: [PATCH 095/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 5e74ed09ec9..81159e8645a 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 781d6dae450..ab4b2a5e409 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 7a6b84f1550..c971050aca0 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 5e74ed09ec9..81159e8645a 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index ad4fdc8b8c2..7d250853146 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index dcb66c44613..599f51a1d49 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index cc739dc1ac2..c511121cbad 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 43d4f0b7422..d717d12c319 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 540067fa7ce..36288e6fa6f 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="536b3da91de6d864d162415433ffea316ed7618c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 73b7b5c5dff64295263323aee49df74e82a5cd27 Mon Sep 17 00:00:00 2001
From: Maxim Zhilyaev <mzhilyaev@mozilla.com>
Date: Fri, 6 Jun 2014 11:02:55 -0700
Subject: [PATCH 096/103] Bug 995806 - test_DirectoryLinksProvider.js xpcshell
 test makes tcp connection to example.com [r=mcmanus] Point to localhost
 instead of nosuchhost for tests.

---
 toolkit/modules/tests/xpcshell/test_DirectoryLinksProvider.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolkit/modules/tests/xpcshell/test_DirectoryLinksProvider.js b/toolkit/modules/tests/xpcshell/test_DirectoryLinksProvider.js
index 92a74cc29b1..a44647c0eb0 100644
--- a/toolkit/modules/tests/xpcshell/test_DirectoryLinksProvider.js
+++ b/toolkit/modules/tests/xpcshell/test_DirectoryLinksProvider.js
@@ -205,7 +205,7 @@ add_task(function test_fetchAndCacheLinks_malformedURI() {
 add_task(function test_fetchAndCacheLinks_unknownHost() {
   yield DirectoryLinksProvider.init();
   yield cleanJsonFile();
-  let nonExistentServer = "http://nosuchhost";
+  let nonExistentServer = "http://nosuchhost.localhost";
   try {
     yield DirectoryLinksProvider._fetchAndCacheLinks(nonExistentServer);
     do_throw("BAD URIs should fail");
@@ -286,7 +286,7 @@ add_task(function test_DirectoryLinksProvider__prefObserver_url() {
   // tests these 2 things:
   // 1. _linksURL is properly set after the pref change
   // 2. invalid source url is correctly handled
-  let exampleUrl = 'http://nosuchhost/bad';
+  let exampleUrl = 'http://nosuchhost.localhost/bad';
   yield promiseDirectoryDownloadOnPrefChange(kSourceUrlPref, exampleUrl);
   do_check_eq(DirectoryLinksProvider._linksURL, exampleUrl);
 

From d5493d072e70515e7764a5def0ea763c4bf37afc Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 11:16:25 -0700
Subject: [PATCH 097/103] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/44d06335df26
Author: Ed Morley <emorley@mozilla.com>
Desc: Revert "Bug 1018214 - adding a number of gaia ui tests for status bar and utility tray accessibility. r=Bebe" for intermittent test failures

This reverts commit 9cd529cf12c4de1f6cb12d15a3916510428304c6.

========

https://hg.mozilla.org/integration/gaia-central/rev/ff0ee640650b
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Revert "Merge pull request #19965 from justindarc/bug1014955"

This reverts commit dbd4e40dd86d0af6bf69a6bb8babee8a5e226be4, reversing
changes made to 7ba9b2f9c727f1021bd4e9b625cd381214002a98.
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 3c87445aab3..e67b4e9e5d5 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "b8a669ee022fc969ec2e2fd8fc10575d14364bcb", 
+    "revision": "44d06335df263f64e6ea5b4344c4322d4fabe9c2", 
     "repo_path": "/integration/gaia-central"
 }

From 62d83108df60156cdf29e9f38151056e2ff3b4f8 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 11:16:36 -0700
Subject: [PATCH 098/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 81159e8645a..1bb630e42e7 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index ab4b2a5e409..05abfa9de3d 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index c971050aca0..612bac0193a 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 81159e8645a..1bb630e42e7 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 7d250853146..d17957b7a10 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 599f51a1d49..9adcbe18473 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index c511121cbad..fe5a769a32e 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index d717d12c319..d62b7281975 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 36288e6fa6f..2d3a92b0758 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="637213e32deb42b051acf6e47755518a8baad34c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From e9c26eb9c26fb85a32a106fc7f14669330fb3d53 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 11:26:32 -0700
Subject: [PATCH 099/103] Bumping gaia.json for 11 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/99abcedfe288
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #19785 from pivanov/bug-1017785

Bug 1017785 - [Flame][FM] - Fuzzy images

========

https://hg.mozilla.org/integration/gaia-central/rev/fbe43ba85164
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1017785 - [Flame][FM] - Fuzzy images

========

https://hg.mozilla.org/integration/gaia-central/rev/7e21290be1fa
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #20148 from zacc/bug_1019891

Bug 1019891

========

https://hg.mozilla.org/integration/gaia-central/rev/21613d2c6094
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 1021737 - Update test_cleanup_gaia to assert that homescreen scroll to 0 upon touch push

========

https://hg.mozilla.org/integration/gaia-central/rev/ae6b9b022516
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 1019905 - Xfail test_everythingme_launch_app before migration

========

https://hg.mozilla.org/integration/gaia-central/rev/415fdacc51a7
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 1019906 - Xfail test_everythingme_search before migration

========

https://hg.mozilla.org/integration/gaia-central/rev/cdb4cef3d37f
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 1019902 - Disable unmigratable tests test_everythingme_add_collection and test_everythingme_app_install

========

https://hg.mozilla.org/integration/gaia-central/rev/4b207cea95fc
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Bug 1021098 - [vertical homescreen] Update unit tests for vertical homescreen

========

https://hg.mozilla.org/integration/gaia-central/rev/7fd8d052da41
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Bug 1021069 - [Vertical homescreen] Update references to homescreen in test_ftu_*

========

https://hg.mozilla.org/integration/gaia-central/rev/9b232af6cdb8
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 1019894 - Migrate test_hs_launch_app.py and test_hs_delete_app.py to vertical homescreen

========

https://hg.mozilla.org/integration/gaia-central/rev/76229c13fad8
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 1019897 - Migrate test_homescreen_move_app.py to new vertical homescreen layout
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index e67b4e9e5d5..e93bc9d1a77 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "44d06335df263f64e6ea5b4344c4322d4fabe9c2", 
+    "revision": "99abcedfe288d6d29352b2add96b5ace90543985", 
     "repo_path": "/integration/gaia-central"
 }

From 640d6025440b1d36f212822f691d341243f894a8 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 11:31:19 -0700
Subject: [PATCH 100/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 4 ++--
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 1bb630e42e7..5d984fc6f41 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3f3963fe6e165c0a7afc6222e1137d0862c70b30"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 05abfa9de3d..6672a7ab782 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3f3963fe6e165c0a7afc6222e1137d0862c70b30"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 612bac0193a..ebcea9cd58a 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3f3963fe6e165c0a7afc6222e1137d0862c70b30"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 1bb630e42e7..5d984fc6f41 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3f3963fe6e165c0a7afc6222e1137d0862c70b30"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index d17957b7a10..3c67eefdbb6 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3f3963fe6e165c0a7afc6222e1137d0862c70b30"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
@@ -119,7 +119,7 @@
   <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="e8a318f7690092e639ba88891606f4183e846d3f"/>
   <project name="device/qcom/common" path="device/qcom/common" revision="34ed8345250bb97262d70a052217a92e83444ede"/>
   <project name="device-flame" path="device/t2m/flame" remote="b2g" revision="95423152b66d4a41032414fc3fb8c3d9a0636c7d"/>
-  <project name="kernel/msm" path="kernel" revision="e3895712aa9ddb955f0fdac880aa553556e64c41"/>
+  <project name="kernel/msm" path="kernel" revision="ccfff630163ca9a0530701fa93b501c34042d06c"/>
   <project name="platform/bootable/recovery" path="bootable/recovery" revision="f2914eacee9120680a41463708bb6ee8291749fc"/>
   <project name="platform/external/bluetooth/bluedroid" path="external/bluetooth/bluedroid" revision="81c4a859d75d413ad688067829d21b7ba9205f81"/>
   <project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="f0689ac1914cdbc59e53bdc9edd9013dc157c299"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 9adcbe18473..c5f952e352f 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3f3963fe6e165c0a7afc6222e1137d0862c70b30"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index fe5a769a32e..be17d5774bd 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3f3963fe6e165c0a7afc6222e1137d0862c70b30"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index d62b7281975..e6559d7a948 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3f3963fe6e165c0a7afc6222e1137d0862c70b30"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 2d3a92b0758..755b0b8a615 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8689f61409f07ad6c7646299326993124a0c309a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3f3963fe6e165c0a7afc6222e1137d0862c70b30"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 2761ee703f9f0729b54b16290e67ea85639297ad Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 6 Jun 2014 11:38:07 -0700
Subject: [PATCH 101/103] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 5d984fc6f41..aab1f34cccd 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -25,7 +25,7 @@
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="a819a94a572c7b32556435491ed8eaab841a95ff"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6a68dde81fcbe3c6bbd45bafdeb94c3f269bdc20"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
   <project name="platform/bionic" path="bionic" revision="c72b8f6359de7ed17c11ddc9dfdde3f615d188a9"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 6672a7ab782..a6133e41f97 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -20,7 +20,7 @@
   <project name="gaia" path="gaia" remote="mozillaorg" revision="3f3963fe6e165c0a7afc6222e1137d0862c70b30"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6a68dde81fcbe3c6bbd45bafdeb94c3f269bdc20"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index ebcea9cd58a..821eaf5f17e 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -23,7 +23,7 @@
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6a68dde81fcbe3c6bbd45bafdeb94c3f269bdc20"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="f92a936f2aa97526d4593386754bdbf02db07a12"/>
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="6e47ff2790f5656b5b074407829ceecf3e6188c4"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 5d984fc6f41..aab1f34cccd 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -25,7 +25,7 @@
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="a819a94a572c7b32556435491ed8eaab841a95ff"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6a68dde81fcbe3c6bbd45bafdeb94c3f269bdc20"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
   <project name="platform/bionic" path="bionic" revision="c72b8f6359de7ed17c11ddc9dfdde3f615d188a9"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 3c67eefdbb6..b2bac679279 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -20,7 +20,7 @@
   <project name="gaia" path="gaia" remote="mozillaorg" revision="3f3963fe6e165c0a7afc6222e1137d0862c70b30"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6a68dde81fcbe3c6bbd45bafdeb94c3f269bdc20"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index c5f952e352f..e00384f62d6 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -22,7 +22,7 @@
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6a68dde81fcbe3c6bbd45bafdeb94c3f269bdc20"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
   <project name="platform/bionic" path="bionic" revision="d2eb6c7b6e1bc7643c17df2d9d9bcb1704d0b9ab"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index e6559d7a948..90663ad0b8f 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -20,7 +20,7 @@
   <project name="gaia" path="gaia" remote="mozillaorg" revision="3f3963fe6e165c0a7afc6222e1137d0862c70b30"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="531cf670e485649c69746e46d567929fcd54cbc5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6a68dde81fcbe3c6bbd45bafdeb94c3f269bdc20"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 755b0b8a615..3506e375cc8 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -22,7 +22,7 @@
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="89812422efe8df364ddf364b4740030496181277"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6a68dde81fcbe3c6bbd45bafdeb94c3f269bdc20"/>
   <project name="gonk-patches" path="patches" remote="b2g" revision="223a2421006e8f5da33f516f6891c87cae86b0f6"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>

From 277cafdbe50de5d7e75e1fe5b888b0731f0dd0c3 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Fri, 6 Jun 2014 11:52:46 -0700
Subject: [PATCH 102/103] Bug 1020730 - If there's no title to show in undo
 close tab toast, just say "Closed tab". r=bnicholson

---
 mobile/android/chrome/content/browser.js              | 11 ++++++++---
 .../android/locales/en-US/chrome/browser.properties   |  4 ++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index f9ec5d11601..22a3c81bcad 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -991,10 +991,15 @@ var BrowserApp = {
       let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
       let closedTabData = ss.getClosedTabs(window)[0];
 
-      let historyEntry = closedTabData.entries[closedTabData.index - 1];
-      let title = historyEntry.title || historyEntry.url;
+      let message;
+      let title = closedTabData.entries[closedTabData.index - 1].title;
+
+      if (title) {
+        message = Strings.browser.formatStringFromName("undoCloseToast.message", [title], 1);
+      } else {
+        message = Strings.browser.GetStringFromName("undoCloseToast.messageDefault");
+      }
 
-      let message = Strings.browser.formatStringFromName("undoCloseToast.message", [title], 1);
       NativeWindow.toast.show(message, "short", {
         button: {
           icon: "drawable://undo_button_icon",
diff --git a/mobile/android/locales/en-US/chrome/browser.properties b/mobile/android/locales/en-US/chrome/browser.properties
index a6079b42351..0a4e34a0a14 100644
--- a/mobile/android/locales/en-US/chrome/browser.properties
+++ b/mobile/android/locales/en-US/chrome/browser.properties
@@ -132,6 +132,10 @@ newtabpopup.switch=SWITCH
 # when the user closes a tab. %S is the title of the tab that was closed.
 undoCloseToast.message=Closed %S
 
+# LOCALIZATION NOTE (undoCloseToast.messageDefault): This message appears in a
+# toast when the user closes a tab if there is no title to display.
+undoCloseToast.messageDefault=Closed tab
+
 # LOCALIZATION NOTE (undoCloseToast.action2): Ideally, this string is short (it's a
 # button label) and upper-case, to match Google and Android's convention.
 undoCloseToast.action2=UNDO

From fc6e1198537d82af9bb548e98add78dc85732c31 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Fri, 6 Jun 2014 11:52:48 -0700
Subject: [PATCH 103/103] Bug 1021123 - Improve colors in remote tabs
 pull-to-refresh. r=mcomella

---
 mobile/android/base/resources/values/colors.xml          | 9 +++++++--
 .../android/base/tabspanel/RemoteTabsContainerPanel.java | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/mobile/android/base/resources/values/colors.xml b/mobile/android/base/resources/values/colors.xml
index aa713201bd8..3a06eb199db 100644
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -93,10 +93,15 @@
 
   <color name="panel_image_item_background">#D1D9E1</color>
 
-  <!-- Swipe to refresh colors -->
+  <!-- Swipe to refresh colors for dynamic panel -->
   <color name="swipe_refresh_orange">#FFFFC26C</color>
   <color name="swipe_refresh_white">#FFFFFFFF</color>
-  <color name="swipe_refresh_orange_dark">#FF9500</color>
+
+  <!-- Swipe to refresh colors for remote tabs -->
+  <color name="swipe_refresh_orange1">#EE6700</color>
+  <color name="swipe_refresh_orange2">#FF9400</color>
+  <color name="swipe_refresh_orange3">#F57900</color>
+  <color name="swipe_refresh_orange4">#FFB44C</color>
 
   <!-- Remote tabs setup -->
   <color name="remote_tabs_setup_button_background">#E66000</color>
diff --git a/mobile/android/base/tabspanel/RemoteTabsContainerPanel.java b/mobile/android/base/tabspanel/RemoteTabsContainerPanel.java
index 444d4fda02a..a32bf885474 100644
--- a/mobile/android/base/tabspanel/RemoteTabsContainerPanel.java
+++ b/mobile/android/base/tabspanel/RemoteTabsContainerPanel.java
@@ -60,8 +60,8 @@ public class RemoteTabsContainerPanel extends GeckoSwipeRefreshLayout
         list = (RemoteTabsList) child;
 
         // Must be called after the child view has been added.
-        setColorScheme(R.color.swipe_refresh_orange_dark, R.color.background_tabs,
-                       R.color.swipe_refresh_orange_dark, R.color.background_tabs);
+        setColorScheme(R.color.swipe_refresh_orange1, R.color.swipe_refresh_orange2,
+                       R.color.swipe_refresh_orange3, R.color.swipe_refresh_orange4);
     }