From 7107e574bb0aff50aa93ffb39d50c5a03841d430 Mon Sep 17 00:00:00 2001
From: Rob Campbell <rcampbell@mozilla.com>
Date: Mon, 3 Mar 2014 11:13:00 -0500
Subject: [PATCH 01/16] Bug 972054 - Numeric status codes in the network
 monitor; r=vp

---
 browser/devtools/netmonitor/netmonitor-view.js  |  2 ++
 browser/devtools/netmonitor/netmonitor.xul      |  2 ++
 browser/devtools/netmonitor/test/head.js        |  3 +++
 .../themes/shared/devtools/netmonitor.inc.css   | 17 ++++++++++++-----
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/browser/devtools/netmonitor/netmonitor-view.js b/browser/devtools/netmonitor/netmonitor-view.js
index bf881f236f37..3d52911395e7 100644
--- a/browser/devtools/netmonitor/netmonitor-view.js
+++ b/browser/devtools/netmonitor/netmonitor-view.js
@@ -1186,6 +1186,8 @@ RequestsMenuView.prototype = Heritage.extend(WidgetMethods, {
       }
       case "status": {
         let node = $(".requests-menu-status", target);
+        let codeNode = $(".requests-menu-status-code", target);
+        codeNode.setAttribute("value", aValue);
         node.setAttribute("code", aValue);
         break;
       }
diff --git a/browser/devtools/netmonitor/netmonitor.xul b/browser/devtools/netmonitor/netmonitor.xul
index 751c0d18b5d0..484088ad4ea8 100644
--- a/browser/devtools/netmonitor/netmonitor.xul
+++ b/browser/devtools/netmonitor/netmonitor.xul
@@ -148,6 +148,8 @@
               <hbox class="requests-menu-subitem requests-menu-status-and-method"
                     align="center">
                 <box class="requests-menu-status"/>
+                <label class="plain requests-menu-status-code"
+                       crop="end"/>
                 <label class="plain requests-menu-method"
                        crop="end"
                        flex="1"/>
diff --git a/browser/devtools/netmonitor/test/head.js b/browser/devtools/netmonitor/test/head.js
index 12cefc8dd0d3..0a5779665b52 100644
--- a/browser/devtools/netmonitor/test/head.js
+++ b/browser/devtools/netmonitor/test/head.js
@@ -248,10 +248,13 @@ function verifyRequestItemTarget(aRequestItem, aMethod, aUrl, aData = {}) {
 
   if (status !== undefined) {
     let value = target.querySelector(".requests-menu-status").getAttribute("code");
+    let codeValue = target.querySelector(".requests-menu-status-code").getAttribute("value");
     let tooltip = target.querySelector(".requests-menu-status-and-method").getAttribute("tooltiptext");
     info("Displayed status: " + value);
+    info("Displayed code: " + codeValue);
     info("Tooltip status: " + tooltip);
     is(value, status, "The displayed status is incorrect.");
+    is(codeValue, status, "The displayed status code is incorrect.");
     is(tooltip, status + " " + statusText, "The tooltip status is incorrect.");
   }
   if (type !== undefined) {
diff --git a/browser/themes/shared/devtools/netmonitor.inc.css b/browser/themes/shared/devtools/netmonitor.inc.css
index 67bae3c9413b..11916e213a9f 100644
--- a/browser/themes/shared/devtools/netmonitor.inc.css
+++ b/browser/themes/shared/devtools/netmonitor.inc.css
@@ -113,7 +113,7 @@
 /* Network requests table: specific column dimensions */
 
 .requests-menu-status-and-method {
-  width: 8em;
+  width: 12em;
 }
 
 .requests-menu-status {
@@ -175,6 +175,13 @@ box.requests-menu-status {
   -moz-margin-end: 5px;
   border-radius: 10px;
   transition: box-shadow 0.5s ease-in-out;
+  margin-bottom: 2px; /* needed to align with text baseline */
+}
+
+label.requests-menu-status-code {
+  -moz-margin-start: 3px !important;
+  width: 3em;
+  -moz-margin-end: -3em !important;
 }
 
 .theme-dark box.requests-menu-status:not([code]) {
@@ -282,22 +289,22 @@ box.requests-menu-status {
 }
 
 .theme-dark .requests-menu-timings-division[division-scale=second] {
-  -moz-border-start-color: #d99b28 !important; /* Light orange highlight color */
+  -moz-border-start-color: #f5f7fa !important; /* Light foreground text */
   font-weight: 600;
 }
 
 .theme-light .requests-menu-timings-division[division-scale=second] {
-  -moz-border-start-color: #d97e00 !important; /* Light orange highlight color */
+  -moz-border-start-color: #585959 !important; /* Grey foreground text */
   font-weight: 600;
 }
 
 .theme-dark .requests-menu-timings-division[division-scale=minute] {
-  -moz-border-start-color: #eb5368 !important; /* Red highlight color */
+  -moz-border-start-color: #f5f7fa !important; /* Light foreground text */
   font-weight: 600;
 }
 
 .theme-light .requests-menu-timings-division[division-scale=minute] {
-  -moz-border-start-color: #ed2655 !important; /* Red highlight color */
+  -moz-border-start-color: #585959 !important; /* Grey foreground text */
   font-weight: 600;
 }
 

From 0d20a0cc9b8ff5c0f48b8d93a97e4bfcdefd07be Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Thu, 27 Feb 2014 12:21:06 -0500
Subject: [PATCH 02/16] bug 969725 - geckoview_example uses incorrect main.xml
 layout and AndroidManifest r=nalexander

---
 .../android/geckoview_example/Makefile.in     | 22 +++++++++++--------
 mobile/android/geckoview_library/Makefile.in  |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/embedding/android/geckoview_example/Makefile.in b/embedding/android/geckoview_example/Makefile.in
index 8b51df080370..d939f6265186 100644
--- a/embedding/android/geckoview_example/Makefile.in
+++ b/embedding/android/geckoview_example/Makefile.in
@@ -25,29 +25,33 @@ ANDROID=$(ANDROID_SDK)/../../tools/android
 TARGET= $(notdir $(ANDROID_SDK))
 
 PACKAGE_DEPS = \
-	build.xml \
-	res/layout/main.xml \
-	AndroidManifest.xml \
-	src/org/mozilla/geckoviewexample/GeckoViewExample.java \
 	assets/libxul.so \
+	build.xml \
+	src/org/mozilla/geckoviewexample/GeckoViewExample.java \
+	$(CURDIR)/res/layout/main.xml \
+	$(CURDIR)/AndroidManifest.xml \
 	$(NULL)
 
-res/layout/main.xml: $(srcdir)/main.xml
+$(CURDIR)/res/layout/main.xml: $(srcdir)/main.xml
 	$(NSINSTALL) $(srcdir)/main.xml res/layout/
 
-AndroidManifest.xml: $(srcdir)/AndroidManifest.xml
-	$(NSINSTALL) $(srcdir)/AndroidManifest.xml .
+$(CURDIR)/AndroidManifest.xml: $(srcdir)/AndroidManifest.xml
+	$(NSINSTALL) $(srcdir)/AndroidManifest.xml $(CURDIR)
 
 src/org/mozilla/geckoviewexample/GeckoViewExample.java: $(srcdir)/GeckoViewExample.java
 	$(NSINSTALL) $(srcdir)/GeckoViewExample.java src/org/mozilla/geckoviewexample/
 
-assets/libxul.so: $(DIST)/geckoview_library/geckoview_assets.zip
+assets/libxul.so: $(DIST)/geckoview_library/geckoview_assets.zip FORCE
 	$(UNZIP) -o $(DIST)/geckoview_library/geckoview_assets.zip
 
 build.xml:
 	$(ANDROID) create project --name GeckoViewExample --target $(TARGET) --path $(CURDIR) --activity GeckoViewExample --package org.mozilla.geckoviewexample
 	$(ANDROID) update project --target $(TARGET) --path $(CURDIR) --library $(DEPTH)/mobile/android/geckoview_library
+	$(RM) $(CURDIR)/res/layout/main.xml
+	$(NSINSTALL) $(srcdir)/main.xml res/layout/
+	$(RM) $(CURDIR)/AndroidManifest.xml
+	$(NSINSTALL) $(srcdir)/AndroidManifest.xml $(CURDIR)
 	echo jar.libs.dir=libs >> project.properties
 
-package: $(PACKAGE_DEPS)
+package: $(PACKAGE_DEPS) FORCE
 	ant debug
diff --git a/mobile/android/geckoview_library/Makefile.in b/mobile/android/geckoview_library/Makefile.in
index 685ce215b509..26c7a1c12cec 100644
--- a/mobile/android/geckoview_library/Makefile.in
+++ b/mobile/android/geckoview_library/Makefile.in
@@ -33,7 +33,7 @@ include $(topsrcdir)/config/rules.mk
 
 _ABS_DIST = $(abspath $(DIST))
 
-package: $(properties_deps)
+package: $(properties_deps) FORCE
 	# Make directory for the zips
 	$(MKDIR) -p $(_ABS_DIST)/geckoview_library
 

From 217b22c65c0462e8f444c5be4246158b85ac05fc Mon Sep 17 00:00:00 2001
From: Rob Campbell <rcampbell@mozilla.com>
Date: Mon, 3 Mar 2014 15:55:46 -0500
Subject: [PATCH 03/16] Bug 972054 - Numeric status codes in the network
 monitor, followup; r=vp

---
 browser/themes/shared/devtools/netmonitor.inc.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/browser/themes/shared/devtools/netmonitor.inc.css b/browser/themes/shared/devtools/netmonitor.inc.css
index 11916e213a9f..6ec11da77470 100644
--- a/browser/themes/shared/devtools/netmonitor.inc.css
+++ b/browser/themes/shared/devtools/netmonitor.inc.css
@@ -175,7 +175,6 @@ box.requests-menu-status {
   -moz-margin-end: 5px;
   border-radius: 10px;
   transition: box-shadow 0.5s ease-in-out;
-  margin-bottom: 2px; /* needed to align with text baseline */
 }
 
 label.requests-menu-status-code {

From ce0cf03b179e00e1289bd17b95f60f5cd8133283 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 27 Feb 2014 17:05:12 +0000
Subject: [PATCH 04/16] Bug 973704 - only style disabled='true' as disabled,
 not disabled='false', after Australis restyle, r=jaws

--HG--
extra : rebase_source : 0584001b5b1d84ff39a17acb7214a8675fbb0310
---
 browser/themes/linux/browser.css   | 12 ++++-----
 browser/themes/osx/browser.css     | 12 ++++-----
 browser/themes/windows/browser.css | 42 +++++++++++++++---------------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index ba9d0d2774d8..76ebce953d4c 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -596,9 +596,9 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
   -moz-padding-end: 5px;
 }
 
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):hover > .toolbarbutton-icon,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([buttonover]):not([open]):hover > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([disabled]):hover > .toolbarbutton-icon {
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([disabled=true]):hover > .toolbarbutton-icon {
   background-color: hsla(0,0%,100%,.3);
   background-image: linear-gradient(hsla(0,0%,100%,.7), hsla(0,0%,100%,.2));
   border: 1px solid rgb(154,154,154);
@@ -613,9 +613,9 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
   margin-bottom: 4px;
 }
 
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover:active > .toolbarbutton-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1[open="true"] > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([disabled]):hover:active > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):hover:active > .toolbarbutton-icon,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1[open="true"] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon,
+:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([disabled=true]):hover:active > .toolbarbutton-icon,
 :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1[open="true"] > .toolbarbutton-icon {
   background-color: rgba(154,154,154,.5);
   background-image: linear-gradient(hsla(0,0%,100%,.7), hsla(0,0%,100%,.4));
@@ -750,7 +750,7 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
 #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker,
 #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
 #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-#main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled] > .toolbarbutton-icon {
+#main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled=true] > .toolbarbutton-icon {
   opacity: 0.4;
 }
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 0436c3091bbd..2130b9121422 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2914,18 +2914,18 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 
 .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover,
 .tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover,
-#TabsToolbar .toolbarbutton-1:not([type="menu-button"]):not([disabled]):not([open]):hover,
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover,
-#TabsToolbar .toolbarbutton-1:not([disabled]):not([buttonover]):hover > .toolbarbutton-menubutton-dropmarker {
+#TabsToolbar .toolbarbutton-1:not([type="menu-button"]):not([disabled=true]):not([open]):hover,
+#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):hover,
+#TabsToolbar .toolbarbutton-1:not([disabled=true]):not([buttonover]):hover > .toolbarbutton-menubutton-dropmarker {
   background-image: linear-gradient(transparent, rgba(0,0,0,.15)) !important;
 }
 
 .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover:active,
 .tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover:active,
-#TabsToolbar .toolbarbutton-1:not([type="menu-button"]):not([disabled]):hover:active,
+#TabsToolbar .toolbarbutton-1:not([type="menu-button"]):not([disabled=true]):hover:active,
 #TabsToolbar .toolbarbutton-1[type="menu"][open],
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover:active,
-#TabsToolbar .toolbarbutton-1[open]:not([disabled]):hover > .toolbarbutton-menubutton-dropmarker {
+#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):hover:active,
+#TabsToolbar .toolbarbutton-1[open]:not([disabled=true]):hover > .toolbarbutton-menubutton-dropmarker {
   background-image: linear-gradient(transparent, rgba(0,0,0,.3)) !important;
 }
 
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index e5ffa5a4fbcd..36f219d35396 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -462,7 +462,7 @@ menuitem.bookmark-item {
 #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker,
 #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
 #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-#main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled] > .toolbarbutton-icon {
+#main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled=true] > .toolbarbutton-icon {
   opacity: .4;
 }
 
@@ -584,7 +584,7 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
 }
 
 #nav-bar .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before,
-#nav-bar .toolbaritem-combined-buttons > .toolbarbutton-1:-moz-any(:not(:hover):not([open]),[disabled]) + .toolbarbutton-1:-moz-any(:not(:hover):not([open]),[disabled])::before {
+#nav-bar .toolbaritem-combined-buttons > .toolbarbutton-1:-moz-any(:not(:hover):not([open]),[disabled=true]) + .toolbarbutton-1:-moz-any(:not(:hover):not([open]),[disabled=true])::before {
   content: "";
   display: -moz-box;
   width: 1px;
@@ -610,12 +610,12 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
   border-bottom-left-radius: 0;
 }
 
-#nav-bar .toolbarbutton-1:not([disabled]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1:not([disabled]):hover > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
-#nav-bar .toolbarbutton-1:not([disabled]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1:not([disabled]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-text,
-#nav-bar .toolbarbutton-1:not([disabled]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-container,
-@conditionalForwardWithUrlbar@ > .toolbarbutton-1:-moz-any([disabled],:not([open]):not([disabled]):not(:active)) > .toolbarbutton-icon {
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):hover > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-text,
+#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-container,
+@conditionalForwardWithUrlbar@ > .toolbarbutton-1:-moz-any([disabled=true],:not([open]):not([disabled=true]):not(:active)) > .toolbarbutton-icon {
   background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
   border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.2) hsla(210,54%,20%,.25);
   box-shadow: 0 1px hsla(0,0%,100%,.3) inset,
@@ -623,20 +623,20 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
               0 0 2px hsla(210,54%,20%,.1);
 }
 
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):not([open]):not(:active):hover > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon,
-@conditionalForwardWithUrlbar@ > #forward-button:not([open]):not(:active):not([disabled]):hover > .toolbarbutton-icon {
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):not([open]):not(:active):hover > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon,
+@conditionalForwardWithUrlbar@ > #forward-button:not([open]):not(:active):not([disabled=true]):hover > .toolbarbutton-icon {
   border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
   background-color: hsla(210,48%,96%,.75);
   box-shadow: 0 0 1px hsla(210,54%,20%,.03),
               0 0 2px hsla(210,54%,20%,.1);
 }
 
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover:active > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon,
-#nav-bar .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-text,
-#nav-bar .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-container {
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):hover:active > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-text,
+#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-container {
   background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
   background-color: hsla(210,54%,20%,.15);
   border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
@@ -649,7 +649,7 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
   transition: none;
 }
 
-#nav-bar .toolbarbutton-1:-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon {
+#nav-bar .toolbarbutton-1:-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon {
   -moz-border-start-color: hsla(210,54%,20%,.35);
 }
 
@@ -667,11 +667,11 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
   padding: 0 3px;
 }
 
-#TabsToolbar .toolbarbutton-1:not([disabled]):hover,
+#TabsToolbar .toolbarbutton-1:not([disabled=true]):hover,
 #TabsToolbar .toolbarbutton-1[open],
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover,
-.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover,
-.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover {
+#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):hover,
+.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled=true]):hover,
+.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled=true]):hover {
   background-image: linear-gradient(rgba(255,255,255,0), rgba(255,255,255,.5)),
                     linear-gradient(transparent, rgba(0,0,0,.25) 30%),
                     linear-gradient(transparent, rgba(0,0,0,.25) 30%);

From 41e5cb7a9336426ea476a9b71b34ed044c6037cf Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Mon, 3 Mar 2014 16:18:28 -0500
Subject: [PATCH 05/16] Bug 975719 - unbreak custom toolbars in Australis,
 r=jaws

--HG--
extra : rebase_source : cb801a739c7706cc26f4ccccabe0708d1b577850
---
 browser/base/content/browser.xul              |   2 +-
 .../customizableui/src/CustomizableUI.jsm     |  51 ++++++++-
 .../customizableui/src/CustomizeMode.jsm      |  14 +++
 .../customizableui/test/browser.ini           |   1 +
 .../test/browser_947987_removable_default.js  |   1 +
 ...browser_975719_customtoolbars_behaviour.js | 100 ++++++++++++++++++
 .../components/customizableui/test/head.js    |   7 +-
 7 files changed, 168 insertions(+), 8 deletions(-)
 create mode 100644 browser/components/customizableui/test/browser_975719_customtoolbars_behaviour.js

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 2adacd72781d..e6b11cd96909 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -502,7 +502,7 @@
 <deck flex="1" id="tab-view-deck">
 <vbox flex="1" id="browser-panel">
 
-  <toolbox id="navigator-toolbox">
+  <toolbox id="navigator-toolbox" mode="icons">
     <!-- Menu -->
     <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
              defaultset="menubar-items"
diff --git a/browser/components/customizableui/src/CustomizableUI.jsm b/browser/components/customizableui/src/CustomizableUI.jsm
index 5274f3351982..36ea1bdcef3a 100644
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -389,9 +389,10 @@ let CustomizableUIInternal = {
 
     // If this area is not registered, try to do it automatically:
     if (!areaProperties) {
-      // If there's no default set attribute at all, we assume that we should
-      // wait for registerArea to be called:
-      if (!aToolbar.hasAttribute("defaultset")) {
+      // If there's no defaultset attribute and this isn't a legacy extra toolbar,
+      // we assume that we should wait for registerArea to be called:
+      if (!aToolbar.hasAttribute("defaultset") &&
+          !aToolbar.hasAttribute("customindex")) {
         if (!gPendingBuildAreas.has(area)) {
           gPendingBuildAreas.set(area, new Map());
         }
@@ -400,7 +401,7 @@ let CustomizableUIInternal = {
         return;
       }
       let props = {type: CustomizableUI.TYPE_TOOLBAR, legacy: true};
-      let defaultsetAttribute = aToolbar.getAttribute("defaultset");
+      let defaultsetAttribute = aToolbar.getAttribute("defaultset") || "";
       props.defaultPlacements = defaultsetAttribute.split(',').filter(s => s);
       this.registerArea(area, props);
       areaProperties = gAreas.get(area);
@@ -2105,6 +2106,8 @@ let CustomizableUIInternal = {
       gUIStateBeforeReset.uiCustomizationState = Services.prefs.getCharPref(kPrefCustomizationState);
     } catch(e) { }
 
+    this._resetExtraToolbars();
+
     Services.prefs.clearUserPref(kPrefCustomizationState);
     Services.prefs.clearUserPref(kPrefDrawInTitlebar);
     LOG("State reset");
@@ -2121,6 +2124,28 @@ let CustomizableUIInternal = {
     }
   },
 
+  _resetExtraToolbars: function(aFilter = null) {
+    let firstWindow = true; // Only need to persist once
+    for (let [win, ] of gBuildWindows) {
+      let toolbox = win.gNavToolbox;
+      for (let child of toolbox.children) {
+        let matchesFilter = !aFilter || aFilter == child.id;
+        if (child.hasAttribute("customindex") && matchesFilter) {
+          if (firstWindow) {
+            let toolbarId = "toolbar" + child.getAttribute("customindex");
+            toolbox.toolbarset.removeAttribute(toolbarId);
+            win.document.persist(toolbox.toolbarset.id, toolbarId);
+            // We have to unregister it properly to ensure we don't kill
+            // XUL widgets which might be in here
+            this.unregisterArea(child.id, true);
+          }
+          child.remove();
+        }
+      }
+      firstWindow = false;
+    }
+  },
+
   _rebuildRegisteredAreas: function() {
     for (let [areaId, areaNodes] of gBuildAreas) {
       let placements = gPlacements.get(areaId);
@@ -2174,6 +2199,10 @@ let CustomizableUIInternal = {
     });
   },
 
+  removeExtraToolbar: function(aToolbarId) {
+    this._resetExtraToolbars(aToolbarId);
+  },
+
   /**
    * @param {String|Node} aWidget - widget ID or a widget node (preferred for performance).
    * @return {Boolean} whether the widget is removable
@@ -2281,7 +2310,8 @@ let CustomizableUIInternal = {
         // Toolbars have a currentSet property which also deals correctly with overflown
         // widgets (if any) - use that instead:
         if (props.get("type") == CustomizableUI.TYPE_TOOLBAR) {
-          currentPlacements = container.currentSet.split(',');
+          let currentSet = container.currentSet;
+          currentPlacements = currentSet ? currentSet.split(',') : [];
           currentPlacements = currentPlacements.filter(removableOrDefault);
         } else {
           // Clone the array so we don't modify the actual placements...
@@ -2942,6 +2972,17 @@ this.CustomizableUI = {
     CustomizableUIInternal.undoReset();
   },
 
+  /**
+   * Remove a custom toolbar added in a previous version of Firefox or using
+   * an add-on. NB: only works on the customizable toolbars generated by
+   * the toolbox itself. Intended for use from CustomizeMode, not by
+   * other consumers.
+   * @param aToolbarId the ID of the toolbar to remove
+   */
+  removeExtraToolbar: function(aToolbarId) {
+    CustomizableUIInternal.removeExtraToolbar(aToolbarId);
+  },
+
   /**
    * Can the last Restore Defaults operation be undone.
    *
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index ee2c5624c148..1076012a331d 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -300,6 +300,8 @@ CustomizeMode.prototype = {
 
     this._handler.isExitingCustomizeMode = true;
 
+    this._removeExtraToolbarsIfEmpty();
+
     CustomizableUI.removeListener(this);
 
     this.document.removeEventListener("keypress", this);
@@ -855,6 +857,18 @@ CustomizeMode.prototype = {
     }.bind(this)).then(null, ERROR);
   },
 
+  _removeExtraToolbarsIfEmpty: function() {
+    let toolbox = this.window.gNavToolbox;
+    for (let child of toolbox.children) {
+      if (child.hasAttribute("customindex")) {
+        let placements = CustomizableUI.getWidgetIdsInArea(child.id);
+        if (!placements.length) {
+          CustomizableUI.removeExtraToolbar(child.id);
+        }
+      }
+    }
+  },
+
   persistCurrentSets: function(aSetBeforePersisting)  {
     let document = this.document;
     let toolbars = document.querySelectorAll("toolbar[customizable='true'][currentset]");
diff --git a/browser/components/customizableui/test/browser.ini b/browser/components/customizableui/test/browser.ini
index c37c133a0b02..b5c40cf366c2 100644
--- a/browser/components/customizableui/test/browser.ini
+++ b/browser/components/customizableui/test/browser.ini
@@ -71,4 +71,5 @@ skip-if = os == "linux"
 [browser_970511_undo_restore_default.js]
 [browser_972267_customizationchange_events.js]
 [browser_973932_addonbar_currentset.js]
+[browser_975719_customtoolbars_behaviour.js]
 [browser_panel_toggle.js]
diff --git a/browser/components/customizableui/test/browser_947987_removable_default.js b/browser/components/customizableui/test/browser_947987_removable_default.js
index c5f8aedb042e..bab782204c83 100644
--- a/browser/components/customizableui/test/browser_947987_removable_default.js
+++ b/browser/components/customizableui/test/browser_947987_removable_default.js
@@ -59,6 +59,7 @@ add_task(function() {
          "Widget should be in navbar in other window.");
     }
   }
+  CustomizableUI.destroyWidget(spec.id);
   yield promiseWindowClosed(otherWin);
 });
 
diff --git a/browser/components/customizableui/test/browser_975719_customtoolbars_behaviour.js b/browser/components/customizableui/test/browser_975719_customtoolbars_behaviour.js
new file mode 100644
index 000000000000..51df624d8b90
--- /dev/null
+++ b/browser/components/customizableui/test/browser_975719_customtoolbars_behaviour.js
@@ -0,0 +1,100 @@
+/* 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";
+
+add_task(function customizeToolbarAndKeepIt() {
+  ok(gNavToolbox.toolbarset, "There should be a toolbarset");
+  let toolbarID = "testAustralisCustomToolbar";
+  gNavToolbox.appendCustomToolbar(toolbarID, "");
+  let toolbarDOMID = getToolboxCustomToolbarId(toolbarID);
+  let toolbarElement = document.getElementById(toolbarDOMID);
+  ok(toolbarElement, "There should be a toolbar");
+  if (!toolbarElement) {
+    ok(false, "No toolbar created, bailing out of the test.");
+    return;
+  }
+  is(toolbarElement.nextSibling, gNavToolbox.toolbarset,
+     "Toolbar should have been inserted in toolbox, before toolbarset element");
+  let cuiAreaType = CustomizableUI.getAreaType(toolbarDOMID);
+  is(cuiAreaType, CustomizableUI.TYPE_TOOLBAR,
+     "CustomizableUI should know the area and think it's a toolbar");
+  if (cuiAreaType != CustomizableUI.TYPE_TOOLBAR) {
+    ok(false, "Toolbar not registered successfully, bailing out of the test.");
+    toolbarElement.remove();
+    return;
+  }
+  ok(!CustomizableUI.getWidgetIdsInArea(toolbarDOMID).length, "There should be no widgets in the area yet.");
+  CustomizableUI.addWidgetToArea("open-file-button", toolbarDOMID, 0);
+  ok(toolbarElement.hasChildNodes(), "Toolbar should now have a button.");
+  assertAreaPlacements(toolbarDOMID, ["open-file-button"]);
+
+  yield startCustomizing();
+  // First, exit customize mode without doing anything, and verify the toolbar doesn't get removed.
+  yield endCustomizing();
+  ok(!CustomizableUI.inDefaultState, "Shouldn't be in default state, the toolbar should still be there.");
+  cuiAreaType = CustomizableUI.getAreaType(toolbarDOMID);
+  is(cuiAreaType, CustomizableUI.TYPE_TOOLBAR,
+     "CustomizableUI should still know the area and think it's a toolbar");
+  ok(toolbarElement.parentNode, "Toolbar should still be in the DOM.");
+  ok(toolbarElement.hasChildNodes(), "Toolbar should still have items in it.");
+  assertAreaPlacements(toolbarDOMID, ["open-file-button"]);
+
+  // Then customize again, and this time empty out the toolbar and verify it *does* get removed.
+  yield startCustomizing();
+  let openFileButton = document.getElementById("open-file-button");
+  let palette = document.getElementById("customization-palette");
+  simulateItemDrag(openFileButton, palette);
+  ok(!CustomizableUI.inDefaultState, "Shouldn't be in default state because there's still a non-collapsed toolbar.");
+  ok(!toolbarElement.hasChildNodes(), "Toolbar should have no more child nodes.");
+
+  toolbarElement.collapsed = true;
+  ok(CustomizableUI.inDefaultState, "Should be in default state because there's now just a collapsed toolbar.");
+  toolbarElement.collapsed = false;
+  ok(!CustomizableUI.inDefaultState, "Shouldn't be in default state because there's a non-collapsed toolbar again.");
+  yield endCustomizing();
+  ok(CustomizableUI.inDefaultState, "Should be in default state because the toolbar should have been removed.");
+  ok(!toolbarElement.parentNode, "Toolbar should no longer be in the DOM.");
+  cuiAreaType = CustomizableUI.getAreaType(toolbarDOMID);
+  is(cuiAreaType, null, "CustomizableUI should have forgotten all about the area");
+});
+
+add_task(function resetShouldDealWithCustomToolbars() {
+  ok(gNavToolbox.toolbarset, "There should be a toolbarset");
+  let toolbarID = "testAustralisCustomToolbar";
+  gNavToolbox.appendCustomToolbar(toolbarID, "");
+  let toolbarDOMID = getToolboxCustomToolbarId(toolbarID);
+  let toolbarElement = document.getElementById(toolbarDOMID);
+  ok(toolbarElement, "There should be a toolbar");
+  if (!toolbarElement) {
+    ok(false, "No toolbar created, bailing out of the test.");
+    return;
+  }
+  is(toolbarElement.nextSibling, gNavToolbox.toolbarset,
+     "Toolbar should have been inserted in toolbox, before toolbarset element");
+  let cuiAreaType = CustomizableUI.getAreaType(toolbarDOMID);
+  is(cuiAreaType, CustomizableUI.TYPE_TOOLBAR,
+     "CustomizableUI should know the area and think it's a toolbar");
+  if (cuiAreaType != CustomizableUI.TYPE_TOOLBAR) {
+    ok(false, "Toolbar not registered successfully, bailing out of the test.");
+    toolbarElement.remove();
+    return;
+  }
+  ok(!CustomizableUI.getWidgetIdsInArea(toolbarDOMID).length, "There should be no widgets in the area yet.");
+  CustomizableUI.addWidgetToArea("sync-button", toolbarDOMID, 0);
+  ok(toolbarElement.hasChildNodes(), "Toolbar should now have a button.");
+  assertAreaPlacements(toolbarDOMID, ["sync-button"]);
+
+  CustomizableUI.reset();
+
+  ok(CustomizableUI.inDefaultState, "Should be in default state after reset.");
+  let syncButton = document.getElementById("sync-button");
+  ok(!syncButton, "Sync button shouldn't be in the document anymore.");
+  ok(gNavToolbox.palette.querySelector("#sync-button"), "Sync button should be in the palette");
+  ok(!toolbarElement.hasChildNodes(), "Toolbar should have no more child nodes.");
+  ok(!toolbarElement.parentNode, "Toolbar should no longer be in the DOM.");
+  cuiAreaType = CustomizableUI.getAreaType(toolbarDOMID);
+  is(cuiAreaType, null, "CustomizableUI should have forgotten all about the area");
+});
+
diff --git a/browser/components/customizableui/test/head.js b/browser/components/customizableui/test/head.js
index 4c08b5f635be..e619a4e84914 100644
--- a/browser/components/customizableui/test/head.js
+++ b/browser/components/customizableui/test/head.js
@@ -11,8 +11,7 @@ Cu.import("resource:///modules/CustomizableUI.jsm", tmp);
 let {Promise, CustomizableUI} = tmp;
 
 let ChromeUtils = {};
-let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader);
-scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
+Services.scriptloader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/ChromeUtils.js", ChromeUtils);
 
 Services.prefs.setBoolPref("browser.uiCustomization.skipSourceNodeCheck", true);
 registerCleanupFunction(() => Services.prefs.clearUserPref("browser.uiCustomization.skipSourceNodeCheck"));
@@ -55,6 +54,10 @@ function removeCustomToolbars() {
   gAddedToolbars.clear();
 }
 
+function getToolboxCustomToolbarId(toolbarName) {
+  return "__customToolbar_" + toolbarName.replace(" ", "_");
+}
+
 function resetCustomization() {
   return CustomizableUI.reset();
 }

From 7ff142b6ac153a99aed0f9237a31997b82e2ddc3 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Mon, 3 Mar 2014 13:41:24 -0800
Subject: [PATCH 06/16] Bug 976849 - Disable extension directory loading in
 Metro [r=rstrong,Mossop]

---
 toolkit/xre/nsXREDirProvider.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index 881a17448c00..1b82b4c9ee25 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -579,6 +579,9 @@ LoadExtensionDirectories(nsINIParser &parser,
 void
 nsXREDirProvider::LoadExtensionBundleDirectories()
 {
+  if (!mozilla::Preferences::GetBool("extensions.defaultProviders.enabled", true))
+    return;
+
   if (mProfileDir && !gSafeMode) {
     nsCOMPtr<nsIFile> extensionsINI;
     mProfileDir->Clone(getter_AddRefs(extensionsINI));

From 8384e153067523b4a2476a70e74c6b79db84ecb4 Mon Sep 17 00:00:00 2001
From: Steven MacLeod <smacleod@mozilla.com>
Date: Mon, 3 Mar 2014 16:55:34 -0500
Subject: [PATCH 07/16] Bug 971778 - Remove the richlistbox from the sync
 datatype selection in preferences. r=ttaubert

---
 browser/components/preferences/sync.js  |  7 +---
 browser/components/preferences/sync.xul | 54 +++++++++----------------
 2 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/browser/components/preferences/sync.js b/browser/components/preferences/sync.js
index de4d726c282e..a4d982c8125f 100644
--- a/browser/components/preferences/sync.js
+++ b/browser/components/preferences/sync.js
@@ -147,11 +147,8 @@ let gSyncPane = {
         document.getElementById("fxaEmailAddress2").textContent = data.email;
         document.getElementById("fxaEmailAddress3").textContent = data.email;
         document.getElementById("fxaSyncComputerName").value = Weave.Service.clientsEngine.localName;
-        let enginesList = document.getElementById("fxaSyncEnginesList")
-        enginesList.disabled = enginesListDisabled;
-        // *sigh* - disabling the <richlistbox> draws each item as if it is disabled,
-        // but doesn't disable the checkboxes.
-        for (let checkbox of enginesList.querySelectorAll("checkbox")) {
+        let engines = document.getElementById("fxaSyncEngines")
+        for (let checkbox of engines.querySelectorAll("checkbox")) {
           checkbox.disabled = enginesListDisabled;
         }
       });
diff --git a/browser/components/preferences/sync.xul b/browser/components/preferences/sync.xul
index ca05e4703521..1f106d6bb963 100644
--- a/browser/components/preferences/sync.xul
+++ b/browser/components/preferences/sync.xul
@@ -259,41 +259,25 @@
 
           <groupbox id="syncOptions">
             <caption label="&syncBrand.shortName.label;"/>
-            <vbox>
-              <richlistbox id="fxaSyncEnginesList"
-                           orient="vertical"
-                           onselect="if (this.selectedCount) this.clearSelection();">
-                <richlistitem>
-                  <checkbox label="&engine.tabs.label;"
-                            accesskey="&engine.tabs.accesskey;"
-                            preference="engine.tabs"/>
-                </richlistitem>
-                <richlistitem>
-                  <checkbox label="&engine.bookmarks.label;"
-                            accesskey="&engine.bookmarks.accesskey;"
-                            preference="engine.bookmarks"/>
-                </richlistitem>
-                <richlistitem>
-                  <checkbox label="&engine.passwords.label;"
-                            accesskey="&engine.passwords.accesskey;"
-                            preference="engine.passwords"/>
-                </richlistitem>
-                <richlistitem>
-                  <checkbox label="&engine.history.label;"
-                            accesskey="&engine.history.accesskey;"
-                            preference="engine.history"/>
-                </richlistitem>
-                <richlistitem>
-                  <checkbox label="&engine.addons.label;"
-                            accesskey="&engine.addons.accesskey;"
-                            preference="engine.addons"/>
-                </richlistitem>
-                <richlistitem>
-                  <checkbox label="&engine.prefs.label;"
-                            accesskey="&engine.prefs.accesskey;"
-                            preference="engine.prefs"/>
-                </richlistitem>
-              </richlistbox>
+            <vbox id="fxaSyncEngines">
+              <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 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>
           </groupbox>
           <hbox align="center">

From e3bc227f978a423b2da86d32a8dee2789be79cca Mon Sep 17 00:00:00 2001
From: Eugen Sawin <esawin@mozilla.com>
Date: Mon, 3 Mar 2014 18:47:55 +0100
Subject: [PATCH 08/16] Bug 950417 - Add XPI intent filter. r=snorp

---
 mobile/android/base/AndroidManifest.xml.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index 75c2c6ae17b5..65c188ee7029 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -141,6 +141,12 @@
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
 
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/x-xpinstall" />
+            </intent-filter>
+
 #ifdef MOZ_ANDROID_BEAM
             <intent-filter>
                 <action android:name="android.nfc.action.NDEF_DISCOVERED"/>

From 1bd84e14ee333d8d9dec19f430a789ebe251906c Mon Sep 17 00:00:00 2001
From: Josh Dover <gerfuls@gmail.com>
Date: Thu, 20 Feb 2014 12:38:27 -0800
Subject: [PATCH 09/16] Bug 974723 - Send shown event when banner message is
 displayed. r=margaret

---
 mobile/android/base/home/HomeBanner.java      |  1 +
 mobile/android/base/tests/testHomeBanner.java |  8 +++-----
 mobile/android/modules/Home.jsm               | 11 ++++++++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/mobile/android/base/home/HomeBanner.java b/mobile/android/base/home/HomeBanner.java
index d0767eda8e10..9ba8a94f3319 100644
--- a/mobile/android/base/home/HomeBanner.java
+++ b/mobile/android/base/home/HomeBanner.java
@@ -138,6 +138,7 @@ public class HomeBanner extends LinearLayout
                 public void run() {
                     mTextView.setText(text);
                     setVisibility(VISIBLE);
+                    GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("HomeBanner:Shown", (String) getTag()));
 
                     // Animate the banner if it is currently active.
                     if (mActive) {
diff --git a/mobile/android/base/tests/testHomeBanner.java b/mobile/android/base/tests/testHomeBanner.java
index c91ecf1601a8..6aef03cf1d24 100644
--- a/mobile/android/base/tests/testHomeBanner.java
+++ b/mobile/android/base/tests/testHomeBanner.java
@@ -42,13 +42,11 @@ public class testHomeBanner extends UITest {
      * Note: This test does not remove the message after it is done.
      */
     private void addBannerTest() {
-        addBannerMessage();
-
-        // Load about:home again, and make sure the onshown handler is called.
+        // Load about:home and make sure the onshown handler is called.
         Actions.EventExpecter eventExpecter = getActions().expectGeckoEvent("TestHomeBanner:MessageShown");
+        addBannerMessage();
         NavigationHelper.enterAndLoadUrl("about:home");
-        // TODO: Add shown event passing from Java: bug 974723
-        // eventExpecter.blockForEvent();
+        eventExpecter.blockForEvent();
 
         // Verify that the banner is visible with the correct text.
         mAboutHome.assertBannerText(TEXT);
diff --git a/mobile/android/modules/Home.jsm b/mobile/android/modules/Home.jsm
index 5de1a2721de7..5bffb448c3d3 100644
--- a/mobile/android/modules/Home.jsm
+++ b/mobile/android/modules/Home.jsm
@@ -69,7 +69,10 @@ let HomeBanner = (function () {
       text: message.text,
       iconURI: message.iconURI
     });
+  };
 
+  let _handleShown = function(id) {
+    let message = _messages[id];
     if (message.onshown)
       message.onshown();
   };
@@ -93,13 +96,17 @@ let HomeBanner = (function () {
           _handleGet();
           break;
 
+        case "HomeBanner:Shown":
+          _handleShown(data);
+          break;
+
         case "HomeBanner:Click":
           _handleClick(data);
           break;
 
         case "HomeBanner:Dismiss":
           _handleDismiss(data);
-          break; 
+          break;
       }
     },
 
@@ -119,6 +126,7 @@ let HomeBanner = (function () {
       // observers to listen for requests from the Java UI.
       if (Object.keys(_messages).length == 1) {
         Services.obs.addObserver(this, "HomeBanner:Get", false);
+        Services.obs.addObserver(this, "HomeBanner:Shown", false);
         Services.obs.addObserver(this, "HomeBanner:Click", false);
         Services.obs.addObserver(this, "HomeBanner:Dismiss", false);
 
@@ -149,6 +157,7 @@ let HomeBanner = (function () {
       // If there are no more messages, remove the observers.
       if (Object.keys(_messages).length == 0) {
         Services.obs.removeObserver(this, "HomeBanner:Get");
+        Services.obs.removeObserver(this, "HomeBanner:Shown");
         Services.obs.removeObserver(this, "HomeBanner:Click");
         Services.obs.removeObserver(this, "HomeBanner:Dismiss");
       }

From bd20337efb8975c9f4073160790752a6143d308b Mon Sep 17 00:00:00 2001
From: Heather Arthur <fayearthur@gmail.com>
Date: Mon, 3 Mar 2014 17:17:04 -0500
Subject: [PATCH 10/16] Bug 978653 - Wait longer to fire 'style-applied' event
 after updating a style sheet in StyleSheetActor. r=pbrosset

---
 browser/devtools/styleeditor/StyleEditorUI.jsm | 1 -
 toolkit/devtools/server/actors/stylesheets.js  | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/devtools/styleeditor/StyleEditorUI.jsm b/browser/devtools/styleeditor/StyleEditorUI.jsm
index 8e052a4f3caf..b91f82ed7ca8 100644
--- a/browser/devtools/styleeditor/StyleEditorUI.jsm
+++ b/browser/devtools/styleeditor/StyleEditorUI.jsm
@@ -268,7 +268,6 @@ StyleEditorUI.prototype = {
       new StyleSheetEditor(styleSheet, this._window, file, isNew, this._walker);
 
     editor.on("property-change", this._summaryChange.bind(this, editor));
-    editor.on("style-applied", this._summaryChange.bind(this, editor));
     editor.on("linked-css-file", this._summaryChange.bind(this, editor));
     editor.on("linked-css-file-error", this._summaryChange.bind(this, editor));
     editor.on("error", this._onError);
diff --git a/toolkit/devtools/server/actors/stylesheets.js b/toolkit/devtools/server/actors/stylesheets.js
index a328fa6e2096..80dc2c81b1f6 100644
--- a/toolkit/devtools/server/actors/stylesheets.js
+++ b/toolkit/devtools/server/actors/stylesheets.js
@@ -23,6 +23,7 @@ loader.lazyGetter(this, "CssLogic", () => require("devtools/styleinspector/css-l
 
 let TRANSITION_CLASS = "moz-styleeditor-transitioning";
 let TRANSITION_DURATION_MS = 500;
+let TRANSITION_BUFFER_MS = 1000;
 let TRANSITION_RULE = "\
 :root.moz-styleeditor-transitioning, :root.moz-styleeditor-transitioning * {\
 transition-duration: " + TRANSITION_DURATION_MS + "ms !important; \
@@ -751,10 +752,10 @@ let StyleSheetActor = protocol.ActorClass({
 
     this._transitionRefCount++;
 
-    // Set up clean up and commit after transition duration (+10% buffer)
+    // Set up clean up and commit after transition duration (+buffer)
     // @see _onTransitionEnd
     this.window.setTimeout(this._onTransitionEnd.bind(this),
-                           Math.floor(TRANSITION_DURATION_MS * 1.1));
+                           TRANSITION_DURATION_MS + TRANSITION_BUFFER_MS);
   },
 
   /**

From d6023b2b81f32101c819c683d457880daedd0e9b Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Mon, 3 Mar 2014 14:22:40 -0800
Subject: [PATCH 11/16] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/d5f9a04fc524
Author: Brian Hackett <bhackett1024@gmail.com>
Desc: Bug 978562 - Remove redundant assignment to {TypedArray}.length, r=gsvelto.
---
 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 b07916358d4b..6cb1fad348b5 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "branch": "", 
         "revision": ""
     }, 
-    "revision": "c195232a409ee2234eca18a63bac2d48c2db0c13", 
+    "revision": "d5f9a04fc52458d7c600b38eef3ea8d35c7b6c07", 
     "repo_path": "/integration/gaia-central"
 }

From 4cb3f114c21e1ce11b3b6b7a1741b8730762c4b1 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Mon, 3 Mar 2014 14:22:48 -0800
Subject: [PATCH 12/16] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 9 ++++++++-
 b2g/config/emulator-jb/sources.xml  | 8 +++++++-
 b2g/config/emulator/sources.xml     | 9 ++++++++-
 b2g/config/hamachi/sources.xml      | 8 +++++++-
 b2g/config/helix/sources.xml        | 7 ++++++-
 b2g/config/inari/sources.xml        | 9 ++++++++-
 b2g/config/leo/sources.xml          | 8 +++++++-
 b2g/config/mako/sources.xml         | 8 +++++++-
 b2g/config/wasabi/sources.xml       | 8 +++++++-
 9 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index a52bc9465b5f..f07da900d8e3 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -1,17 +1,24 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
+  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was git://codeaurora.org/-->
+  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/b2g-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2gmozilla"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
+  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!--original fetch url was git://github.com/apitrace/-->
+  <!--original fetch url was https://git.mozilla.org/external/apitrace-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="refs/tags/android-4.0.4_r2.1" sync-j="4"/>
   <!-- Gonk specific things and forks -->
@@ -19,7 +26,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="fd883f4f086f95f2a9d2f94c7299fa7780aee19d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d11f524d00cacf5ba0dfbf25e4aa2158b1c3a036"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 8f146648de85..9e10dd39eaaa 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
+  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was git://github.com/apitrace/-->
+  <!--original fetch url was https://git.mozilla.org/external/apitrace-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <!--original fetch url was git://codeaurora.org/-->
+  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
+  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="97a5b461686757dbb8ecab2aac5903e41d2e1afe">
@@ -17,7 +23,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="fd883f4f086f95f2a9d2f94c7299fa7780aee19d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="3d5c964015967ca8c86abe6dbbebee3cb82b1609"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b2f773d8320d30648b89767dfe5b25ef94bc7e62"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index a52bc9465b5f..f07da900d8e3 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -1,17 +1,24 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
+  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was git://codeaurora.org/-->
+  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/b2g-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2gmozilla"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
+  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!--original fetch url was git://github.com/apitrace/-->
+  <!--original fetch url was https://git.mozilla.org/external/apitrace-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="refs/tags/android-4.0.4_r2.1" sync-j="4"/>
   <!-- Gonk specific things and forks -->
@@ -19,7 +26,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="fd883f4f086f95f2a9d2f94c7299fa7780aee19d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d11f524d00cacf5ba0dfbf25e4aa2158b1c3a036"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 722536482adc..0444303e5d72 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
+  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was git://codeaurora.org/-->
+  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
+  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!--original fetch url was git://github.com/apitrace/-->
+  <!--original fetch url was https://git.mozilla.org/external/apitrace-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="b2g/ics_strawberry" sync-j="4"/>
   <!-- Gonk specific things and forks -->
@@ -17,7 +23,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="fd883f4f086f95f2a9d2f94c7299fa7780aee19d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 998269e64d8b..3c50e4795c48 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
+  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was git://codeaurora.org/-->
+  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
+  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <default remote="caf" revision="b2g/ics_strawberry" sync-j="4"/>
   <!-- Gonk specific things and forks -->
@@ -15,7 +20,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="fd883f4f086f95f2a9d2f94c7299fa7780aee19d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml
index ae8d60a0e92a..d0abe6465b89 100644
--- a/b2g/config/inari/sources.xml
+++ b/b2g/config/inari/sources.xml
@@ -1,17 +1,24 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
+  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was https://git.mozilla.org/b2g-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2gmozilla"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was git://codeaurora.org/-->
+  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
+  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!--original fetch url was git://github.com/apitrace/-->
+  <!--original fetch url was https://git.mozilla.org/external/apitrace-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="ics_chocolate_rb4.2" sync-j="4"/>
   <!-- Gonk specific things and forks -->
@@ -19,7 +26,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="fd883f4f086f95f2a9d2f94c7299fa7780aee19d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml
index d0de426d35ea..739a703dc549 100644
--- a/b2g/config/leo/sources.xml
+++ b/b2g/config/leo/sources.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
+  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was git://codeaurora.org/-->
+  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
+  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!--original fetch url was git://github.com/apitrace/-->
+  <!--original fetch url was https://git.mozilla.org/external/apitrace-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="b2g/ics_strawberry" sync-j="4"/>
   <!-- Gonk specific things and forks -->
@@ -17,7 +23,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="fd883f4f086f95f2a9d2f94c7299fa7780aee19d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml
index f1db0881435e..e0b1bae81f8e 100644
--- a/b2g/config/mako/sources.xml
+++ b/b2g/config/mako/sources.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
+  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was git://github.com/apitrace/-->
+  <!--original fetch url was https://git.mozilla.org/external/apitrace-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <!--original fetch url was git://codeaurora.org/-->
+  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
+  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="97a5b461686757dbb8ecab2aac5903e41d2e1afe">
@@ -17,7 +23,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="fd883f4f086f95f2a9d2f94c7299fa7780aee19d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="3d5c964015967ca8c86abe6dbbebee3cb82b1609"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b2f773d8320d30648b89767dfe5b25ef94bc7e62"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 57a4d9cac6a9..f8f2c4fe1621 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
+  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
+  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was git://codeaurora.org/-->
+  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
+  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!--original fetch url was git://github.com/apitrace/-->
+  <!--original fetch url was https://git.mozilla.org/external/apitrace-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="ics_chocolate_rb4.2" sync-j="4"/>
   <!-- Gonk specific things and forks -->
@@ -17,7 +23,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="fd883f4f086f95f2a9d2f94c7299fa7780aee19d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>

From 844d2dde1de15f3c768806830c90512b29898174 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Mon, 3 Mar 2014 14:26:28 -0800
Subject: [PATCH 13/16] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 7 -------
 b2g/config/emulator-jb/sources.xml  | 6 ------
 b2g/config/emulator/sources.xml     | 7 -------
 b2g/config/hamachi/sources.xml      | 6 ------
 b2g/config/helix/sources.xml        | 5 -----
 b2g/config/inari/sources.xml        | 7 -------
 b2g/config/leo/sources.xml          | 6 ------
 b2g/config/mako/sources.xml         | 6 ------
 b2g/config/wasabi/sources.xml       | 6 ------
 9 files changed, 56 deletions(-)

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index f07da900d8e3..b1f0ef369aba 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -1,24 +1,17 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
-  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was git://codeaurora.org/-->
-  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/b2g-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2gmozilla"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
-  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!--original fetch url was git://github.com/apitrace/-->
-  <!--original fetch url was https://git.mozilla.org/external/apitrace-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="refs/tags/android-4.0.4_r2.1" sync-j="4"/>
   <!-- Gonk specific things and forks -->
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 9e10dd39eaaa..57665c548b11 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -1,21 +1,15 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
-  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was git://github.com/apitrace/-->
-  <!--original fetch url was https://git.mozilla.org/external/apitrace-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <!--original fetch url was git://codeaurora.org/-->
-  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
-  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="97a5b461686757dbb8ecab2aac5903e41d2e1afe">
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index f07da900d8e3..b1f0ef369aba 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -1,24 +1,17 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
-  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was git://codeaurora.org/-->
-  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/b2g-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2gmozilla"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
-  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!--original fetch url was git://github.com/apitrace/-->
-  <!--original fetch url was https://git.mozilla.org/external/apitrace-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="refs/tags/android-4.0.4_r2.1" sync-j="4"/>
   <!-- Gonk specific things and forks -->
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 0444303e5d72..01d8452ef49f 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -1,21 +1,15 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
-  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was git://codeaurora.org/-->
-  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
-  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!--original fetch url was git://github.com/apitrace/-->
-  <!--original fetch url was https://git.mozilla.org/external/apitrace-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="b2g/ics_strawberry" sync-j="4"/>
   <!-- Gonk specific things and forks -->
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 3c50e4795c48..9b9c9bdd04cf 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -1,18 +1,13 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
-  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was git://codeaurora.org/-->
-  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
-  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <default remote="caf" revision="b2g/ics_strawberry" sync-j="4"/>
   <!-- Gonk specific things and forks -->
diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml
index d0abe6465b89..36f9e914bca6 100644
--- a/b2g/config/inari/sources.xml
+++ b/b2g/config/inari/sources.xml
@@ -1,24 +1,17 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
-  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was https://git.mozilla.org/b2g-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2gmozilla"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was git://codeaurora.org/-->
-  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
-  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!--original fetch url was git://github.com/apitrace/-->
-  <!--original fetch url was https://git.mozilla.org/external/apitrace-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="ics_chocolate_rb4.2" sync-j="4"/>
   <!-- Gonk specific things and forks -->
diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml
index 739a703dc549..76a8f6a40b9e 100644
--- a/b2g/config/leo/sources.xml
+++ b/b2g/config/leo/sources.xml
@@ -1,21 +1,15 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
-  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was git://codeaurora.org/-->
-  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
-  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!--original fetch url was git://github.com/apitrace/-->
-  <!--original fetch url was https://git.mozilla.org/external/apitrace-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="b2g/ics_strawberry" sync-j="4"/>
   <!-- Gonk specific things and forks -->
diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml
index e0b1bae81f8e..51b04d25a0ce 100644
--- a/b2g/config/mako/sources.xml
+++ b/b2g/config/mako/sources.xml
@@ -1,21 +1,15 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
-  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was git://github.com/apitrace/-->
-  <!--original fetch url was https://git.mozilla.org/external/apitrace-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <!--original fetch url was git://codeaurora.org/-->
-  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
-  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="97a5b461686757dbb8ecab2aac5903e41d2e1afe">
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index f8f2c4fe1621..00f02b3cc66a 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -1,21 +1,15 @@
 <?xml version="1.0" ?><manifest>
   <!--original fetch url was https://android.googlesource.com/-->
-  <!--original fetch url was https://git.mozilla.org/external/aosp-->
   <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
   <!--original fetch url was git://github.com/mozilla-b2g/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
   <!--original fetch url was git://github.com/mozilla/-->
-  <!--original fetch url was https://git.mozilla.org/b2g-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was git://codeaurora.org/-->
-  <!--original fetch url was https://git.mozilla.org/external/caf-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
-  <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!--original fetch url was git://github.com/apitrace/-->
-  <!--original fetch url was https://git.mozilla.org/external/apitrace-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="ics_chocolate_rb4.2" sync-j="4"/>
   <!-- Gonk specific things and forks -->

From 06bd61997cb0b066949d0dabef870edcad7195de Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Mon, 3 Mar 2014 14:40:16 -0800
Subject: [PATCH 14/16] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/ac8b988b122a
Author: John Ford <john@johnford.info>
Desc: Revert "Merge pull request #14453 from arroway/bug-945111"

https://bugzilla.mozilla.org/show_bug.cgi?id=945111#c27

This reverts commit c17ce6040081294f8b6b3ed52decd6788da20dce, reversing
changes made to ba2cd3f149cb2e39b8d0449b4e862b036884a248.
---
 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 6cb1fad348b5..14d54a813444 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "branch": "", 
         "revision": ""
     }, 
-    "revision": "d5f9a04fc52458d7c600b38eef3ea8d35c7b6c07", 
+    "revision": "ac8b988b122a95d657c730dcdfabbebf03385b43", 
     "repo_path": "/integration/gaia-central"
 }

From 15a2e070f52b2cc4f6ba7c4fcd6170a25f333ec8 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Mon, 3 Mar 2014 17:48:12 -0500
Subject: [PATCH 15/16] Backed out changeset 7e424486f60e (bug 950417) for
 adding new attack surface.

---
 mobile/android/base/AndroidManifest.xml.in | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index 65c188ee7029..75c2c6ae17b5 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -141,12 +141,6 @@
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="application/x-xpinstall" />
-            </intent-filter>
-
 #ifdef MOZ_ANDROID_BEAM
             <intent-filter>
                 <action android:name="android.nfc.action.NDEF_DISCOVERED"/>

From 307f4f1420bc831228e14900d01e5bdd5fc6c9b0 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Mon, 3 Mar 2014 14:51:12 -0800
Subject: [PATCH 16/16] Bumping manifests a=b2g-bump

---
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/inari/sources.xml        | 2 +-
 b2g/config/leo/sources.xml          | 2 +-
 b2g/config/mako/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 b1f0ef369aba..776b52a17f54 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="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6df4533f14ec2645bb13d8a803a5151583ca13a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d11f524d00cacf5ba0dfbf25e4aa2158b1c3a036"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 57665c548b11..0c15332adb6f 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="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6df4533f14ec2645bb13d8a803a5151583ca13a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="3d5c964015967ca8c86abe6dbbebee3cb82b1609"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b2f773d8320d30648b89767dfe5b25ef94bc7e62"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index b1f0ef369aba..776b52a17f54 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="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6df4533f14ec2645bb13d8a803a5151583ca13a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d11f524d00cacf5ba0dfbf25e4aa2158b1c3a036"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 01d8452ef49f..c7134fae0405 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="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6df4533f14ec2645bb13d8a803a5151583ca13a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 9b9c9bdd04cf..a713db5988af 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="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6df4533f14ec2645bb13d8a803a5151583ca13a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml
index 36f9e914bca6..1da8c3968b0a 100644
--- a/b2g/config/inari/sources.xml
+++ b/b2g/config/inari/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="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6df4533f14ec2645bb13d8a803a5151583ca13a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml
index 76a8f6a40b9e..550722d34d4d 100644
--- a/b2g/config/leo/sources.xml
+++ b/b2g/config/leo/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="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6df4533f14ec2645bb13d8a803a5151583ca13a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml
index 51b04d25a0ce..68e1dd8af650 100644
--- a/b2g/config/mako/sources.xml
+++ b/b2g/config/mako/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="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6df4533f14ec2645bb13d8a803a5151583ca13a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="3d5c964015967ca8c86abe6dbbebee3cb82b1609"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b2f773d8320d30648b89767dfe5b25ef94bc7e62"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 00f02b3cc66a..6aaadaeaad01 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="a495164d731c2dbe2eeb15eb1cc967e471c0e4f4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6df4533f14ec2645bb13d8a803a5151583ca13a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="15e8982284c4560f9c74c2b9fe8bb361ebfe0cb6"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>