From 1b9e763364f00e161ff75ec1bb8af28d35ab000e Mon Sep 17 00:00:00 2001
From: Edouard Oger <edouard.oger@gmail.com>
Date: Tue, 4 Aug 2015 11:46:00 +0200
Subject: [PATCH 01/56] Bug 1149721 - Restyle the Sync preferences page. r=jaws

---
 .../components/preferences/in-content/sync.js |  12 +-
 .../preferences/in-content/sync.xul           | 235 ++++++++++--------
 .../en-US/chrome/browser/preferences/sync.dtd |  14 ++
 browser/themes/linux/jar.mn                   |   9 +-
 browser/themes/osx/jar.mn                     |   9 +-
 .../themes/osx/preferences/preferences.css    |   4 -
 .../customizableui/panelUIOverlay.inc.css     |   6 +-
 browser/themes/shared/fxa/android.png         | Bin 0 -> 15286 bytes
 browser/themes/shared/fxa/android@2x.png      | Bin 0 -> 736 bytes
 browser/themes/shared/fxa/default-avatar.png  | Bin 0 -> 1562 bytes
 .../themes/shared/fxa/default-avatar@2x.png   | Bin 0 -> 2560 bytes
 .../shared/fxa/default-profile-image.svg      |   9 -
 browser/themes/shared/fxa/logo.png            | Bin 0 -> 17703 bytes
 browser/themes/shared/fxa/logo@2x.png         | Bin 0 -> 4517 bytes
 .../themes/shared/fxa/sync-illustration.png   | Bin 0 -> 18697 bytes
 .../shared/fxa/sync-illustration@2x.png       | Bin 0 -> 8682 bytes
 .../shared/incontentprefs/preferences.inc.css | 172 ++++++++++---
 browser/themes/windows/jar.mn                 |   9 +-
 18 files changed, 325 insertions(+), 154 deletions(-)
 create mode 100644 browser/themes/shared/fxa/android.png
 create mode 100644 browser/themes/shared/fxa/android@2x.png
 create mode 100644 browser/themes/shared/fxa/default-avatar.png
 create mode 100644 browser/themes/shared/fxa/default-avatar@2x.png
 delete mode 100644 browser/themes/shared/fxa/default-profile-image.svg
 create mode 100644 browser/themes/shared/fxa/logo.png
 create mode 100644 browser/themes/shared/fxa/logo@2x.png
 create mode 100644 browser/themes/shared/fxa/sync-illustration.png
 create mode 100644 browser/themes/shared/fxa/sync-illustration@2x.png

diff --git a/browser/components/preferences/in-content/sync.js b/browser/components/preferences/in-content/sync.js
index c4b4993f5c8..c4a8e4da073 100644
--- a/browser/components/preferences/in-content/sync.js
+++ b/browser/components/preferences/in-content/sync.js
@@ -240,18 +240,14 @@ let gSyncPane = {
       gSyncPane.startOver(true);
       return false;
     });
-    setEventListener("noFxaSignUp", "click", function () {
+    setEventListener("noFxaSignUp", "command", function () {
       gSyncPane.signUp();
       return false;
     });
-    setEventListener("noFxaSignIn", "click", function () {
+    setEventListener("noFxaSignIn", "command", function () {
       gSyncPane.signIn();
       return false;
     });
-    setEventListener("noFxaUseOldSync", "click", function () {
-      gSyncPane.openOldSyncSupportPage();
-      return false;
-    });
     setEventListener("verifiedManage", "command",
       gSyncPane.manageFirefoxAccount);
     setEventListener("fxaUnlinkButton", "click", function () {
@@ -259,13 +255,13 @@ let gSyncPane = {
     });
     setEventListener("verifyFxaAccount", "command",
       gSyncPane.verifyFirefoxAccount);
-    setEventListener("unverifiedUnlinkFxaAccount", "click", function () {
+    setEventListener("unverifiedUnlinkFxaAccount", "command", function () {
       /* no warning as account can't have previously synced */
       gSyncPane.unlinkFirefoxAccount(false);
     });
     setEventListener("rejectReSignIn", "command",
       gSyncPane.reSignIn);
-    setEventListener("rejectUnlinkFxaAccount", "click", function () {
+    setEventListener("rejectUnlinkFxaAccount", "command", function () {
       gSyncPane.unlinkFirefoxAccount(true);
     });
     setEventListener("tosPP-small-ToS", "click", gSyncPane.openToS);
diff --git a/browser/components/preferences/in-content/sync.xul b/browser/components/preferences/in-content/sync.xul
index 1f4b364d0fa..9bfaf028690 100644
--- a/browser/components/preferences/in-content/sync.xul
+++ b/browser/components/preferences/in-content/sync.xul
@@ -200,112 +200,133 @@
   </vbox>
 
   <!-- These panels are for the Firefox Accounts identity provider -->
-  <vbox id="noFxaAccount" align="start">
-    <label>&welcome.description;</label>
-    <label id="noFxaSignUp" class="text-link">
-      &welcome.createAccount.label;
-    </label>
-    <label id="noFxaSignIn" class="text-link">
-      &welcome.signIn.label;
-    </label>
-    <separator/>
-    <label id="noFxaUseOldSync" class="text-link">
-      &welcome.useOldSync.label;
-    </label>
+  <vbox id="noFxaAccount">
+    <hbox>
+      <groupbox id="noFxaGroup">
+        <vbox>
+          <label id="noFxaCaption">&signedOut.caption;</label>
+          <description id="noFxaDescription" flex="1">&signedOut.description;</description>
+          <hbox class="fxaAccountBox">
+            <image class="fxaFirefoxLogo"/>
+            <vbox>
+              <label id="signedOutAccountBoxTitle">&signedOut.accountBox.title;</label>
+              <hbox>
+                <button id="noFxaSignUp" label="&signedOut.accountBox.create;"/>
+                <button id="noFxaSignIn" label="&signedOut.accountBox.signin;"/>
+              </hbox>
+            </vbox>
+          </hbox>
+        </vbox>
+      </groupbox>
+      <image class="fxaSyncIllustration"/>
+    </hbox>
+    <hbox class="fxaMobilePromo">
+      <label>&mobilePromo.start;</label>
+      <image class="androidLogo"/>
+      <label class="text-link"
+             href="https://www.mozilla.org/firefox/android/">
+        &mobilePromo.androidLink;
+      </label>
+      <label>&mobilePromo.end;</label>
+    </hbox>
+    <label class="androidAttribution">&androidAttribution;</label>
   </vbox>
 
   <vbox id="hasFxaAccount">
-    <groupbox id="fxaGroup">
-      <caption><label>&syncBrand.fxAccount.label;</label></caption>
+    <hbox>
+      <vbox>
+        <groupbox id="fxaGroup">
+          <caption><label>&syncBrand.fxAccount.label;</label></caption>
 
-      <deck id="fxaLoginStatus">
+              <deck id="fxaLoginStatus">
 
-        <!-- logged in and verified and all is good -->
-        <hbox id="fxaLoginVerified"
-              align="center">
-          <hbox align="center">
-            <image id="fxaProfileImage"
-              onclick="gSyncPane.openChangeProfileImage();" hidden="true"
-              tooltiptext="&profilePicture.tooltip;"/>
-            <label id="fxaEmailAddress1"/>
-            <label id="fxaDisplayName" hidden="true"/>
+                <!-- logged in and verified and all is good -->
+                <hbox id="fxaLoginVerified" class="fxaAccountBox">
+                  <image id="fxaProfileImage"
+                      onclick="gSyncPane.openChangeProfileImage();" hidden="true"
+                      tooltiptext="&profilePicture.tooltip;" class="actionable"/>
+                  <vbox>
+                    <label id="fxaEmailAddress1"/>
+                    <label id="fxaDisplayName" hidden="true"/>
+                    <hbox class="fxaAccountBoxButtons">
+                      <button id="verifiedManage" label="&manage.label;"/>
+                      <button id="fxaUnlinkButton" label="&disconnect.label;"/>
+                    </hbox>
+                  </vbox>
+                </hbox>
+
+                <!-- logged in to an unverified account -->
+                <hbox id="fxaLoginUnverified" class="fxaAccountBox">
+                  <image id="fxaProfileImage"/>
+                  <vbox>
+                    <hbox>
+                      <vbox><image id="fxaLoginRejectedWarning"/></vbox>
+                      <description>
+                        &signedInUnverified.beforename.label;
+                        <label id="fxaEmailAddress2"/>
+                        &signedInUnverified.aftername.label;
+                      </description>
+                    </hbox>
+                    <hbox class="fxaAccountBoxButtons">
+                      <button id="verifyFxaAccount" label="&verify.label;"/>
+                      <button id="unverifiedUnlinkFxaAccount" label="&forget.label;"/>
+                    </hbox>
+                  </vbox>
+                </hbox>
+
+                <!-- logged in locally but server rejected credentials -->
+                <hbox id="fxaLoginRejected" class="fxaAccountBox">
+                  <image id="fxaProfileImage"/>
+                  <vbox>
+                    <hbox>
+                      <vbox><image id="fxaLoginRejectedWarning"/></vbox>
+                      <description>
+                        &signedInLoginFailure.beforename.label;
+                        <label id="fxaEmailAddress3"/>
+                        &signedInLoginFailure.aftername.label;
+                      </description>
+                    </hbox>
+                    <hbox class="fxaAccountBoxButtons">
+                      <button id="rejectReSignIn" label="&signIn.label;"/>
+                      <button id="rejectUnlinkFxaAccount" label="&forget.label;"/>
+                    </hbox>
+                  </vbox>
+                </hbox>
+              </deck>
+        </groupbox>
+        <groupbox id="syncOptions">
+          <caption><label>&signedIn.engines.caption;</label></caption>
+          <hbox id="fxaSyncEngines">
+            <vbox align="start">
+              <checkbox label="&engine.tabs.label;"
+                        accesskey="&engine.tabs.accesskey;"
+                        preference="engine.tabs"/>
+              <checkbox label="&engine.bookmarks.label;"
+                        accesskey="&engine.bookmarks.accesskey;"
+                        preference="engine.bookmarks"/>
+              <checkbox label="&engine.passwords.label;"
+                        accesskey="&engine.passwords.accesskey;"
+                        preference="engine.passwords"/>
+            </vbox>
+            <vbox align="start">
+              <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>
+            <spacer/>
           </hbox>
-          <spacer flex="1"/>
-          <button id="verifiedManage"
-                  label="&manage.label;"/>
-          <button id="fxaUnlinkButton"
-                  label="&disconnect.label;"/>
-        </hbox>
-
-        <!-- logged in to an unverified account -->
-        <hbox id="fxaLoginUnverified"
-              flex="1">
-          <description>
-            &signedInUnverified.beforename.label;
-            <label id="fxaEmailAddress2"/>
-            &signedInUnverified.aftername.label;
-          </description>
-          <spacer flex="1"/>
-          <vbox align="end">
-            <button id="verifyFxaAccount"
-                    label="&verify.label;"/>
-            <label id="unverifiedUnlinkFxaAccount" class="text-link">
-              &forget.label;
-            </label>
-          </vbox>
-        </hbox>
-
-        <!-- logged in locally but server rejected credentials -->
-        <hbox id="fxaLoginRejected"
-              flex="1">
-          <vbox>
-            <image id="fxaLoginRejectedWarning"/>
-          </vbox>
-          <description>
-            &signedInLoginFailure.beforename.label;
-            <label id="fxaEmailAddress3"/>
-            &signedInLoginFailure.aftername.label;
-          </description>
-          <spacer flex="1"/>
-          <vbox align="end">
-            <button id="rejectReSignIn"
-                    label="&signIn.label;"/>
-            <label id="rejectUnlinkFxaAccount" class="text-link">
-              &forget.label;
-            </label>
-          </vbox>
-        </hbox>
-      </deck>
-    </groupbox>
-
-    <groupbox id="syncOptions">
-      <caption><label>&syncBrand.shortName.label;</label></caption>
-      <hbox id="fxaSyncEngines">
-        <vbox align="start">
-          <checkbox label="&engine.tabs.label;"
-                    accesskey="&engine.tabs.accesskey;"
-                    preference="engine.tabs"/>
-          <checkbox label="&engine.bookmarks.label;"
-                    accesskey="&engine.bookmarks.accesskey;"
-                    preference="engine.bookmarks"/>
-          <checkbox label="&engine.passwords.label;"
-                    accesskey="&engine.passwords.accesskey;"
-                    preference="engine.passwords"/>
-        </vbox>
-        <vbox align="start">
-          <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>
-        <spacer/>
-      </hbox>
-    </groupbox>
+        </groupbox>
+      </vbox>
+      <spacer flex="1"/>
+      <image class="fxaSyncIllustration"/>
+    </hbox>
+    <spacer class="separator"/>
     <groupbox>
       <caption>
         <label accesskey="&syncDeviceName.accesskey;"
@@ -314,9 +335,10 @@
         </label>
       </caption>
       <hbox id="fxaDeviceName">
-        <hbox flex="1">
+        <hbox>
           <textbox id="fxaSyncComputerName" disabled="true" flex="1"/>
         </hbox>
+        <spacer flex="1"/>
         <hbox>
           <button id="fxaChangeDeviceName"
                   label="&changeSyncDeviceName.label;"/>
@@ -329,6 +351,16 @@
         </hbox>
       </hbox>
     </groupbox>
+    <spacer class="separator"/>
+    <hbox class="fxaMobilePromo">
+      <label>&mobilePromo.start;</label>
+      <image class="androidLogo"/>
+      <label class="text-link"
+             href="https://www.mozilla.org/firefox/android/">
+        &mobilePromo.androidLink;
+      </label>
+      <label>&mobilePromo.end;</label>
+    </hbox>
     <spacer flex="1"/>
     <vbox id="tosPP-small">
       <label id="tosPP-small-ToS" class="text-link">
@@ -338,5 +370,6 @@
         &fxaPrivacyNotice.link.label;
       </label>
     </vbox>
+    <label class="androidAttribution">&androidAttribution;</label>
   </vbox>
 </deck>
diff --git a/browser/locales/en-US/chrome/browser/preferences/sync.dtd b/browser/locales/en-US/chrome/browser/preferences/sync.dtd
index 9bc65504998..605daa635d9 100644
--- a/browser/locales/en-US/chrome/browser/preferences/sync.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/sync.dtd
@@ -83,3 +83,17 @@ both, to better adapt this sentence to their language.
 <!ENTITY welcome.createAccount.label "Create Account">
 
 <!ENTITY welcome.useOldSync.label "Using an older version of Sync?">
+
+<!ENTITY signedOut.caption            "Take your Web with you">
+<!ENTITY signedOut.description        "Synchronize your bookmarks, history, tabs, passwords, add-ons, and preferences across all your devices.">
+<!ENTITY signedOut.accountBox.title   "Connect with a &syncBrand.fxAccount.label;">
+<!ENTITY signedOut.accountBox.create  "Create Account">
+<!ENTITY signedOut.accountBox.signin  "Sign In">
+
+<!ENTITY signedIn.engines.caption     "Sync between all devices">
+
+<!ENTITY mobilePromo.start            "Download Firefox for ">
+<!-- LOCALIZATION NOTE (mobilePromo.androidLink): This is a link title that links to https://www.mozilla.org/firefox/android/ -->
+<!ENTITY mobilePromo.androidLink      "Android™">
+<!ENTITY mobilePromo.end              " to sync with your mobile device.">
+<!ENTITY androidAttribution           "Android is a trademark of Google Inc.">
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index 3ca98270a36..1b6d6ce5b0a 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -222,7 +222,14 @@ browser.jar:
   skin/classic/browser/preferences/in-content/favicon.ico     (../shared/incontentprefs/favicon.ico)
   skin/classic/browser/preferences/in-content/icons.svg       (../shared/incontentprefs/icons.svg)
   skin/classic/browser/preferences/in-content/search.css      (../shared/incontentprefs/search.css)
-  skin/classic/browser/fxa/default-profile-image.svg   (../shared/fxa/default-profile-image.svg)
+  skin/classic/browser/fxa/default-avatar.png                 (../shared/fxa/default-avatar.png)
+  skin/classic/browser/fxa/default-avatar@2x.png              (../shared/fxa/default-avatar@2x.png)
+  skin/classic/browser/fxa/logo.png                           (../shared/fxa/logo.png)
+  skin/classic/browser/fxa/logo@2x.png                        (../shared/fxa/logo@2x.png)
+  skin/classic/browser/fxa/sync-illustration.png              (../shared/fxa/sync-illustration.png)
+  skin/classic/browser/fxa/sync-illustration@2x.png           (../shared/fxa/sync-illustration@2x.png)
+  skin/classic/browser/fxa/android.png                        (../shared/fxa/android.png)
+  skin/classic/browser/fxa/android@2x.png                     (../shared/fxa/android@2x.png)
   skin/classic/browser/preferences/applications.css   (preferences/applications.css)
   skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css)
   skin/classic/browser/preferences/search.css         (preferences/search.css)
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index cd7d24d613c..2ed2e12421a 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -298,7 +298,14 @@ browser.jar:
   skin/classic/browser/preferences/in-content/favicon.ico     (../shared/incontentprefs/favicon.ico)
   skin/classic/browser/preferences/in-content/icons.svg       (../shared/incontentprefs/icons.svg)
   skin/classic/browser/preferences/in-content/search.css      (../shared/incontentprefs/search.css)
-  skin/classic/browser/fxa/default-profile-image.svg   (../shared/fxa/default-profile-image.svg)
+  skin/classic/browser/fxa/default-avatar.png               (../shared/fxa/default-avatar.png)
+  skin/classic/browser/fxa/default-avatar@2x.png            (../shared/fxa/default-avatar@2x.png)
+  skin/classic/browser/fxa/logo.png                         (../shared/fxa/logo.png)
+  skin/classic/browser/fxa/logo@2x.png                      (../shared/fxa/logo@2x.png)
+  skin/classic/browser/fxa/sync-illustration.png            (../shared/fxa/sync-illustration.png)
+  skin/classic/browser/fxa/sync-illustration@2x.png         (../shared/fxa/sync-illustration@2x.png)
+  skin/classic/browser/fxa/android.png                      (../shared/fxa/android.png)
+  skin/classic/browser/fxa/android@2x.png                   (../shared/fxa/android@2x.png)
   skin/classic/browser/preferences/applications.css         (preferences/applications.css)
   skin/classic/browser/preferences/aboutPermissions.css     (preferences/aboutPermissions.css)
   skin/classic/browser/preferences/search.css               (preferences/search.css)
diff --git a/browser/themes/osx/preferences/preferences.css b/browser/themes/osx/preferences/preferences.css
index 932624e065d..bd17e57fb8b 100644
--- a/browser/themes/osx/preferences/preferences.css
+++ b/browser/themes/osx/preferences/preferences.css
@@ -238,10 +238,6 @@ html|a.inline-link:-moz-focusring {
   margin-bottom: 1em;
 }
 
-#fxaUnlinkButton {
-  margin: 0;
-}
-
 #noFxaAccount {
   margin: 12px 4px;
   line-height: 1.2em;
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 28fdd5fd662..4380ba38771 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -702,7 +702,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
 }
 
 #PanelUI-footer-fxa[fxaprofileimage="enabled"] > #PanelUI-fxa-status > #PanelUI-fxa-avatar {
-  list-style-image: url(chrome://browser/skin/fxa/default-profile-image.svg);
+  list-style-image: url(chrome://browser/skin/fxa/default-avatar.png)
 }
 
 #PanelUI-customize:hover,
@@ -1498,6 +1498,10 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left {
     list-style-image: url(chrome://branding/content/icon32.png);
   }
 
+  #PanelUI-footer-fxa[fxaprofileimage="enabled"] > #PanelUI-fxa-status > #PanelUI-fxa-avatar {
+    list-style-image: url(chrome://browser/skin/fxa/default-avatar@2x.png)
+  }
+
   #PanelUI-fxa-label,
   #PanelUI-fxa-icon {
     list-style-image: url(chrome://browser/skin/sync-horizontalbar@2x.png);
diff --git a/browser/themes/shared/fxa/android.png b/browser/themes/shared/fxa/android.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb1ada87ffa878bcafe13172a865505b73070e11
GIT binary patch
literal 15286
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
Y2`#vGy?g6r^Ud0-xz)Z;pJ`b45A-{~cmMzZ

literal 0
HcmV?d00001

diff --git a/browser/themes/shared/fxa/android@2x.png b/browser/themes/shared/fxa/android@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..957b9071c7cba152d3418406ff0cf915d5736578
GIT binary patch
literal 736
zcmeAS@N?(olHy`uVBq!ia0vp^20(1V!3HFE2UfoVQjEnx?oJHr&dIz4aySb-B8wRq
z#8g3;(KATp15j{UiEBiObAE1aYF-ILvPY1wLUKlFUUp7uo`SKFLS}kieo<<Q6|ZBk
zv!|z(f}UQLnx5XFhC?lSdWU!EftZI^=;@Uj0J*CY^z^I_%>W7(@OrpLSSc6)fw`lR
z8HlzpurLA9ZjK-l#CNp-(dMScAj-hi5v<I>*wGR!ZfI_9Amqt>1?Yvxo-U3d6?5K9
zxA#8mAkiLu@LbaZkHVr2lZyrK#JstqIGZEyt=fxsDdHRB7cQ9H?fT-uD-A!T8~O@P
zOn$5vU%mg*wJ@go|77kx`ZlU2@9+MdXXaVGbW)-#``X+M`BrwO{@gh?&n0jAVETi>
zwA-@mfJ8}bT5#;1W2||+$MqZ7Kk$XcJP+nA<lE<XIN^<=eDxFM*;yT`AK2y{)U#l%
z{lJp+;biB}>e_pk8P-2w)p@45f%Dx@^~^)Evz7ZFgcfk_(>dgyP#m+-ax>R`md@q}
zmp53>-gj93^YMAFKM3ErqrUIZ_H-R92I)DCP99VLZF~Kp^q+~K?zU;KqQeCOUZ!VX
zjcwI$K5p3<7Q8o<mGNrbwzQkA2j;0<;EhN-_+z7w!}9pw>_I9QF7FYHy;Q7da3(O}
zg;T<m#RpDAHJmDcn7yhY@5}do!-vPGUirC4Z+`p|%a28h5*1<#8Z6Y!XW0p|Ybcys
zX<#72__0z*ff0c;wmCff@7Ha{HJ5?)h~?t{Yomljlf5<1SZ;O_G|&^`aBwL3p6;sS
zuOTjQ_iyCIiRx3hm%RVCrfIc(s?O6b>!S0o@64RYz!@RNIiVqSq5}g{ae48!zxT8!
uy?K`NdvExXo!*z;hOd+drojLInHj_<Z9d#9f20A(W$<+Mb6Mw<&;$T{bt2{f

literal 0
HcmV?d00001

diff --git a/browser/themes/shared/fxa/default-avatar.png b/browser/themes/shared/fxa/default-avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ed0e7a777d3a57be0cb4a2fb6edea10854ed55e
GIT binary patch
literal 1562
zcmd^8i#OB>6#j`B@`xSLNj54(sU`IAR>O?eI~<Wmge7Y+_9$u>y)13Cc_ohsVJ($v
z5eg%un8Cz6%oxUu8S^q@p60RB-?8W1?|kR`&OP6`_ndqG2nvAdX`5&R0HEg!hlZ%w
z^&7O*zc~kOJXNHT?B(wT053~*WS2oIZJq!R@dtohD*(v94FFP=mA?)EzuEx+BMtzZ
zs{vq7Ms0tvDrkphkYA{`s$q0y@&8j3a|F^FgTog{q}wvNoWm0=QRtuM2}BBAE>|d(
zN(OuL^8yixT2v?$Br0Q_#bt8&NEG%fk;3BgQ8@Anjk&ocoWd+keO;n$aIj>WDu_&D
zPA`zC8|*p4Ds_XiN@tCsuvjuxD3YLYWIAh8Ad-AU<1kB<FAJnGG*&K`)0muzIXqt|
z<_SbXv1E<GR!uZVSYd7QMPdnVg(jA6Z*X{Wg<^V<G(L-;oG0K{XtQ`SnYKZpv&Ls}
z6b5^HTeiB+6o|wkiBv3+ZVAO4-WCeGJd0nM!7g+80veM$hQ@8nWXseI;u>R1B<Avk
zI5Lf{T1FsJD3lANHPsDdshfaR6qp?nZ~@SV-*`T;%AYhvjLG)9_jq`Y>}?L?f*)z>
z4Gcq!KBK-&4_1Wl<8*nQ8#Ug}@Xfo~M&U_V%LcEZmG2E_XLb#hZ??1|<=G$GKM~nd
z7MzDsMXSaC2!jGepzq--u`>gH5di?kmfxV}8)Cr)0Cgi@s8=X_{Ld;{l%bcw$5Z(R
z<_6}W-nRMW8ch+03ZtD%tO`x7w2Ht7tlO-$!62i3#zDoPJo({4%B1Bf7ewEHSu&A?
z$jd|Y^xS`V0y%a#4eqz%YJ;veFiVcJKYGRzgDmiCw@I;Yq$d^VZc=rl9UV%p9y#i8
zBz2M+T=6qH36a(JAPeD$8o1%+_*Ax|c&T@1zjHuCW`Aw6%R7z!42PtWx1KY7={C*v
ze7l}ET47@+<1$3>@2=+_7>sUvJP_YY(SZcTdcgP4)Os~6G%x-2v?M*wT8*UD40eOe
zTK4j0wcb6`y>dJuoOi9D#rBMD)h%Qhl&*avyKf}?gV=6o>4$%*6$cizN8KTnK8;f*
zQq4P%{_~>?8d13hCw0*FCi{1%QGu&}Lz-3{nMP@0C--(47Y<b2?JgNg9f+<anPZ<c
z9ea@oo_}ct7aJG)gOgxh(z;&)4?e47?LHSHt!Q!4B95gZQPFzWfMKW4)^}T5Q+joV
zeJYFMMew)!5^;Lv?RdrB!a-62+3mhzuEA7O;zO=&Jk1&(6OXO+fN~FM6Jcr9o#O{x
z{rZHffkvo-5AKhfF8N%t@NxrnUM+OQytsCPEo{eedT7nC<AE-9%N;|ce=ff?e19eA
zhxw@(^JA^*PzNnWiwWD}Sa^pX$nkX3-RH5v^{E|dS?-eleayF%>pew&!{7<iv)S1x
zyB36a%SJjvGhJ%PsdTC-c<s8&J*Pi|U@Hx8Zi^J$sWNj;k7$8JJjxctZ0_G(x~M;w
z%Pi)_-Ybo$>@;PYMLRQtCfb|{7u#P|2TuRQjO?8cO#mglIiGzw`iWfTorxI<W|Tp4
zavq@8Q=2pQj06{BF!wI#^dN_B%8h@s?d~>&dE&_vBGK<kHFU%K(8FPadio8p2OS&Z
zF3Rm0LTq10-9~~^#_%(??>!Nop=+cJ_0X;;JLFK37~#?7)H(I4wrINkewKe(MGD3z
zFwD*^@wAEctKo-@CE)U}ixx4TYD^N|m4hr}HJ?O9;&FI<WK@k)_bsK`TupsLM`jL8
P^)-O6cL22OY+T`g$Buwf

literal 0
HcmV?d00001

diff --git a/browser/themes/shared/fxa/default-avatar@2x.png b/browser/themes/shared/fxa/default-avatar@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bda852f5a40a65435a73596e87664e8600a46db
GIT binary patch
literal 2560
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
XFxd8`Mj(bHno)p@gNJ>CZ7A$t{$;U9

literal 0
HcmV?d00001

diff --git a/browser/themes/shared/fxa/default-profile-image.svg b/browser/themes/shared/fxa/default-profile-image.svg
deleted file mode 100644
index 2b95431cd6f..00000000000
--- a/browser/themes/shared/fxa/default-profile-image.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000">
-  <path fill="#c3cfd8" d="M500-0.3c276.1,0,500,223.9,500,500s-223.9,500-500,500S0,775.8,0,499.7C0,223.5,223.9-0.3,500-0.3z"/>
-  <circle fill="#fff" cx="500" cy="317" r="139.1"/>
-  <path fill="#fff" d="M751.8,643.6L751.8,643.6c0.1-2.3,0.2-4.6,0.2-6.9c0-68-55.3-127-136.2-156.3L505.9,590.4h0 c-0.4,29.8-1.4,58.8-2.8,86.6c-1,0.1-2,0.3-3.1,0.3s-2-0.2-3.1-0.3c-1.4-27.9-2.4-56.9-2.8-86.7h0L384.3,480.4 C303.3,509.7,248,568.7,248,636.7c0,2.3,0.1,4.6,0.2,6.9l7.4,49.7c57.1,72,145.4,118.2,244.4,118.2c99,0,187.3-46.2,244.4-118.2 L751.8,643.6z"/>
-</svg>
diff --git a/browser/themes/shared/fxa/logo.png b/browser/themes/shared/fxa/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b54b392cccd03dbac9c3e96fd88d3349fc80015a
GIT binary patch
literal 17703
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

literal 0
HcmV?d00001

diff --git a/browser/themes/shared/fxa/logo@2x.png b/browser/themes/shared/fxa/logo@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d25f05d8791edceb048a8766c2028f094fdf414
GIT binary patch
literal 4517
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
Dm77h_

literal 0
HcmV?d00001

diff --git a/browser/themes/shared/fxa/sync-illustration.png b/browser/themes/shared/fxa/sync-illustration.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6de26c9f9be668b57f9a77daa18ba570c59339a
GIT binary patch
literal 18697
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

literal 0
HcmV?d00001

diff --git a/browser/themes/shared/fxa/sync-illustration@2x.png b/browser/themes/shared/fxa/sync-illustration@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc13da3897dda1d7deca5bd25121229a5d843bc9
GIT binary patch
literal 8682
zcmdscby$?$*X~1ulqdqi5HBjBq;z+82}lhf3W9Vvz>oq;cS$!$BPA^@F*Jyjbf?5H
z#2LW%cYMz|-*^4KbA5k(bIr`2eXo11b+5Ir*|VQ{KBy|o;NK#@1polPoUEie0HE|E
zU*Xu8NQB<Riw8NNIH=2r1I7KIHRJ@xR#w*m07xEPy-?)TAMPT-SVt)xM+uuZZ_KP6
z0aICZB^pz6Cu>V9Giw@-r!*F?tZnSgUhw0KX-LS)@zb!dxYDt(eD(VJj)kT53(M8V
z);ty#CpP4?0L;R||1};7+TzPf>G0FAAs;+qPr0u~UN&CNt5I6)>iudi#d|gKaB*A>
zY*J#^G&T+~zH6MFhllNs9NGu~&}_*`ifO)0+ME`VjZp)2*j3)SMWKjO(0%K<o@B27
zJO5Q`&bo~ua{L%En$LU_;ob`3Bw~`EM@Dor&>vxE<lM>-L63>XHWmuVlo)DoJ!sh3
zaoIlin5%o9qV4``X2VVIIkFAc57GNyH+#58i;jv56e^!zUIGAHI?+_N@+XD$szf#F
z(VfT4`Go8FiO*I>87qfR4^V(KRr2bs9tpl;!$S7(N)oKYT5=8gQSJ>GDd3f8(afEn
zx$b|eyQ}le(om_u`(&WxkPiS<V>${n3{-a%Kt1veTCWyt>c>`4fo7w5hmhBrPzSd7
zPlycZ5rPc|RDhE&WN<9paPgqEMYMR-#YwqRFO>pF!?ExR&F3M&EE_ZY)H=3;1(@IY
zODK$Q2@LS4yK`;7TQ3z>0YuS;2Y$Ue)q9z3nD0BbatkmQC670*Tm^3ivRu^mrX9jj
z0dh%M&nUiS@Z9?JQghKc08pg=WkI-B^>!@t*|VrUEQ}2YEZ~JXgp-<=tfIWG{Vgi+
z`p!^m1rKF#yw*4>;SW?`Od->5wB@ZX&ub_p0Nlr3+vXq3T*@}y*gyennX;;vpWCzP
z7@pp%>A4Ne8FAhgTL0u*wm(K+`Q!8y06>FmR?k#G!O`PXn1)Q~fDX|R;@R`CsAK=a
zlDj}N3jSA*$~ka+Jt=j^j48AM06I7^k12!IS(J2*SOKrU@LPzmOrtgS?sY=P#_<8L
zDB3{5OHi<ywNQDZGXS8Gdo2)1GmI1H8i@d+-M{)S%Y0G3Rk~pq1#yqosz*>$0IC4g
zVcUsKn2$7dLvWXRWhPrWkH|@;FCTXAA_Q`%jNxREtOk9pAk;_)09x;UZBvgeM7e2?
zLB<dxQin{$4g#&bc`l=A>v_lHx4h2IPypcaax+=!y^=9mXAhW@DFTB;T&>WmE09i)
z+LT0*B+@V2Pf|C;{+>d+G$V0Egkqn6JB4wJcw#9V{Bclsr+7!!*=&EWQnh98lv_U}
z<#=kg1kU_w8Jb$c(O0`7<h~T_|0e8gd+ux0m(-;*&$b#ps)#WAFFO5>L=AM+F$OXK
zK<VpmmFgR$thM>({gw$t--A=92U<H^Pz(T%gZwv`u}G5&-kLqm*&9qjfp@ng&ewi%
zXuL#jB}xOLTaiW}yyJos<>EL(P~nmd{bJf?RWTpnl{H8+y$;UPR)VdZ3CC>|ZV&)8
zx}1_KykyHd#j`I`owiVbhjLw1rlnMiI*of#4Y@@dga8d6r=SrZ*}VBmdoyk=3h*)j
za~YLy4g5B9uYLFn2?`J?iss<!n;s%8Xkicr0NXg<@8^%9Q9#LdAlntia)6gO&UcRZ
zVVi;Y1L$KYj2#P&;`~Ibm@(rS3Lr1lY84|$!`ejz=YR1klAECM?aXFgJ-wxUlRkSZ
zOlSeDlgYXe)JqzxJF7+4p?=guvHzxvAfvROJ?Bl*xm|x}VjxF~N3wLw#6y@eMqV;a
zr)P^$RPN%s|EyiV7*U!CR?&K+JVU74A_W$_?KOp^Rf$u>N22lrC6|Crd~zxD6PK=j
z=4q}&1Ph-m|LH;8l=(Da{+)6?1}-c}TmREB{Wz!dIQgy%eyEyBcxqPwL1c(9W!d%z
zO&opB!Tv;~(TDrXGXeo@UX#opMTiGns3ofsZl9n@IoxkGFKlm{x4k6LJC>Dyx9Kao
zL%E1A@PjZtkeX~LC$?*Y05$kTq*~`#;W5KAEXqY(c7E_QVQmIJbBqclI*A>(Vbykm
zrfQ+JKo_ZrW7ijIdx?*__a{B;(aRJU6#7YZkCksRD4P=O`;k#rYzOEMNXK@^5ugV0
zY9ope^ccjssRZ_ZWXYx50ab%^u8XEvEs|F4AIF5EQ3>|n>5PA&o|OJr^O{n!jT;nq
zP>ARf_!}0d;C(?U+6J1knpT*x3xCk|W$b+5>0byo)r!^$B8`JmClN@eSm^DI=f@H~
z=6e!jEfT%m2V>`plvsS?g_hHV%;|o|&#?&DWp;Fqqg_CY*k#2|BA+Ga0H?y(%rT**
z<O~OJg9t-FXb~y1Yk;p<Kz#1P81x_TY4H{O35in96G8?e4l^)V<D$kS2+DxEB18{|
zROhU#rz(NeXb&}V@4x!S_5~>!gE~3t)S?*^UNGWvaas1Z#rt7o(^;s?l32ZzhcJ$e
zFg;{qq+1GOqfHq4-uunp5976Ztl>AZR<=f!<1VFf{kYj5e6Zsv72RGT*nt3SCwrMn
zW>sWj_pKMEOuqk1Uk7Jr=X;>4=PIaMh#gAmvcG!VTl|9n{7`j^z8R=4L7(2P0I1^m
zvFD&L+Rn*){O?N&gD0NcP3Y$K(ejr2wyMJe`u+#D)$L#In5TNXxVQOl?qhtUBp8@u
z7~RcwK981gC<v6`NQYw1>=99v_mEm0IbNp@<Fw3e9{>&MtDtRh?1qL-gc~%1D_l@H
zdF8q4i?w*1$P#h>FodC988jiXxh(&TW^o;D9<50EAGkA%sBfm`B+Rz*MbXF`bGpy4
z76D-s31_%ZUnB0oB14R`bh+~Lv#6+VgnjRh_}+HPSaq=&m3}`)Nd#pNg({5UU@rC9
zo3k_<JUN@%mw$fgF7O$aK71bjI`T@V4Js#}{3E3ugBcoKdNO(XZ`G*TC{C~aQWxf|
z%KycJp>p!eKT00UyN8#vpwxO0+(ABOp6d5^ml~+k2Gt&~y?@pK22=SeEbR*BR)*f2
zeD(8c9qQa$UfQ6WJ4VaHLCzLqc$mu(IX@v{4$N;p!&?6?B?WI_lObk5Pih(&;Wc^6
zT@uUJX;7-aTkWjp^-?DP-GS}x;<7wSyxzf_pL`Z&Ih>QP=8-AVkKmDsx2AAQzS8gN
zdHKuaXEEk#SQ|YduWfwxDTR%Vu(@Puw?3;fl;lQIdMw-r->KEt_KUe-!OrvqLnY^u
z`?qto31$N$viJwKWuTO}?2?iXM-9iw<y8IT-XeYaQ?n%wq<T86iCb;l^rFZZylq3C
zqW!R>=)=+Z(G@Gmy#=$X6$>SiI6DH0?IJr$iMcF%f<qPiC5L<Rc;c$i>;nv38-Eux
z&WG}!7KLi0GBDXWdF1swZ*944T$K?CSLbYOP4dD;NxYq{<w&GVa%<LGS{l*lid@t@
z{YG#Z$_cILLi%TdMjuc24{p-~jj2~1dK|^7lZBhYdJ@f)J;c%y<hM`po;D52+OY6|
zTa(tPwE5JB@KUv43vW}4`Q@w6JLy;JwhQ+OvSB7~Qr@?I9KAdT+SGVrj<ls-*#?k8
z48xAOMLE(r=|!5wVltei5i<~^3ha-pHLJJJ$kINjCT6Y))ws3c{zxF0S5cu1YoV$s
zK0}z)!LE4W1srQi_|bkF(}E0r-!**&q=Jw<6Kb2i?-g6ZD@1q8WC}VS@{DNj#z3N_
z*+)&@G#+fyY^RW<Zdn}jg~h)YQa^lDnP7OrFItfneera3kuHMPW!c8`VjQN|A$}HK
zP&8YDK)cyqm~HME-<H0|EBO(;E_;GPcIP4L9d!R$udknPv7Mn=`O>x!fdbP+ZU4GQ
zEEP@z&-*GSE<QnF`+04%o&(m~AVkk+O}``j5$d1CsRs*5N^~Cu%hAkVZY!k_eCPMm
zIdENx(M=1@GnAU@I>+omAqsQm0k1@x^sOgrzx3wM;OBC^t4;68ql5SU?dP6QL&8a+
zM>-Y1os>hSniDWCOFq;*_DGq+o)S|p<ZC$i#-u8vnJR4!u5NiMDp^N}<`Pb9DZNww
z6nBJZ^wG{wQW8%QHiHK2+k@NtGF7C$E)nQ|npr8BP$ZLfKF%3DY)OO(l=PxHNgj4N
z?8aa&$w)RmISvvZvzmdJk>ounkVx@0;$aY`J)KsWkjvMpfZWtV&?odu-FN80d`+Cg
zGYx_<{oiyE2SVsj+U|Sa?cuEHXdkXP7sCXM_4n(rBs3Tco@WXck@i=kD7_B?kBKc=
ze(O!;!`kL#5TNaV@Yu=tne;8*wB-xON^=9IluR4%?4#{G)xw1Oo3dRB1Ku#7&@s>R
zyRtyE{lI+-H+)x9q0N`RJ`YUlt0P^su*U>{OX3-8rQ%`WrR}J@(_~=z2RpdQ$EPNR
z>fuho?Lx@!;5JNHZ@3tEXqO>|r4|0AFZcSNRESclC6|F5i^R%^*kKet$y{y0OdkV!
zt*LmlBXE96I(66&Y+<%bw+ZgxIFH@tDBlD<bz7;a4OC2{FW`vvrQ&4Zrd@{1BICtJ
zn8BSYwz@++ty%Gm1V8m-k!SFm@~uLAO&*w}u%ZiCzTbSMnoP*qH50d%aef_C1RELj
zJ1mW#+C030byzBuoS1^>;Oy~)uEYxw-*xviv7<&sQp%eo2FN5`9+;zWQQu9dZfwD|
z<W!_&$s>+DWVRPOJwBeiMB~%c|G*pvtFLpx)tHm8ksQat&g*&8|B>5<;wra0>pyb~
zS*lt|_C^uXG=HGkfWmLSRMW7a5If?|Jx(dPzwQgDRm3O1_-ewf9(#fEtwWx~B)=_^
zS>eeu|MIAiEK5_?{mjxR#%`0R<oj^-Fmjit%Y02!h>H=+V?h`GT!(%p{{&;B)#u*r
zm~$(xU8CznJ5(>mWlZjHv%0S8U!(5Lee3uBKxMB{^M9h|GFRxUxXbQ!(%)QuR@Yr6
z?<Gud$(g5=#oo4rGxQ-{`auSk4Y7_baI~Cc6C+oT2sfbqAh%k-+Hx0z1mx8a)nEPX
z;S98^IIQiVqv5Z)EcYj+i@>IPT=KP{;o9JC_-i*4HHe_O|86IR8TpRkwPImb*Aq=|
zDJ<|x;X=sM5Es_+jR)*FsiZ>nS|qoa1iUUt%!c-)6FTaszaK`#XY~dd*64zNqWp5{
zS>vv4``_q<-ZeV#2ig~8=&A}{Ln)j#4fwc7zLRp5FcR4!i>l^%G@ZIu0-kQJ8KLeg
z)lP=L<{MCZ2<K*FE`NM%ou7`|Je5^cUy))}?iojw0h-sDyQvoRi0|yoTt`95hRb_P
z0N}%7@|m=Ox5spK!gr#6K?Zv$mYlpzfw`TTZn{<qV)C7fE55pkA!gG>`hdE3CIB|u
zI##59`bCIwZ(HrEyJpK$)b{z!#z1L#4<-*iQqni1q^#chRSCL95AOwFPKD6y>)diy
zN1e)56QUDIp#$6ytvOlXq-bl=IqH#$vbP~BWlu{=B;j`ql#~3e`RMOH^tqxU-l2!K
zu&&(A3@`R^XWOPVdnBmh9op$d9Uk`G55=?qI-JC1w7E#U`ea~_eE&#WbLJH(R&W9&
z!A^G_i82rDfqqTzGu4TL73)F412E3GTv1Q&(Bo2@*xF56Zz31%su~std(GJuR48U*
zdtSN-v(YVLyx_<xjaM%Wx@hU8xf&S;Y|<bUd?$!S3-1hXwOx0%3=tTJWYo1z6z09G
z{A;%)4!2x2?d_cBi1SK@6}G|5V&04?hASawXB=#W@aD)n-SnDR41{Hiep&CMbxT3a
zsP(;H+6O<s`3DnZEwqeG4;da4&5D)|(3i@xD>VnmrWYlXV5)hxg38;C?K`LY6ps$P
zZKCRYja{4@-D(?tXi=hDM!4jkoj7iV&<sg<$jr!$6@Wg+WZMs&XM3O1EcB0SBC@zJ
zZ6C!11xy)By>Q*{Uh3=`Ex@uwGoi5JE){t(^}P@ZI=kyzOAH}`k2U)fS^Ndpc^jj=
zr>(e5^ux5;8~R|O*Ln*sqJ_69zUcgz6xH1ZEb*c6DWrd;Hg#4vWSyfoN`A>&(G7p|
z$$jmaEUN9N#J+-Y-$Kd{+9eU)7*h79kxk0w)ZdlOic?FVQ-`!McdcArM4HjV%0ea&
zpw{_G7R#P%#WGYm_G1Ym)aS(Tsb)-)gjhkI15lp>S8Ano_I~KT{i4;@LcyzieYWV5
zs`J}?!62^ErtF<XKF9cPN#7iLx|weNQu_OSi=UVGBuc{#1Poxb;{Y70NdOyKJI+9=
zPBl#Oi1zq(n3*Fny{HjgHr%z`<5E54Ne(Z{=^e|Xp6<zW4al=J<cw(J@IcJMFih~-
zjrF$WVTG8*4B43h1hrX}czzf;N!qX3NB3e1w0)%>C=;P~2}#*U2Tx@H)mUaVc0Mal
zRDce~z@6?i^qt;a{-s()76MdrmBJo9-~Bp)&W(U2i06G%5HnI(tWH!3^E~B3nxLm7
z3yXblCQ{GjQ@B}Lbp%$Y;LgOM0F@`PuF)p8jItf-ukKTW5BP)w^cyaZxCKR1V=Fx_
zF|Ln2(|z)q#$?TQ>EWxGlZ;!mw6s1nU;L|v9uY$azFDVlybpd)!c3dJR13t_s$>vm
z5b|JT3$@nIP4x1<GVh1<ukOfPN}26C`yWGyInLvoeX-(ImR;@;Qh|jNW&t*gpu0d0
z*bWr{nj_{Vpg_D2vbh?iyeP|2@Z`3CkmX)`=q0vS^`nUjk*ox_w+a#og<31Ut&^a3
zKbu)wRr+Oql)LDu`B6_{u+{v5E9rUg(ZjyN<kdHy4G(uFzi+yUbj>G~?Nhe7D452r
z7!wM6oNInon^}fB=G5NR&>l64w;bFdz$01XJ<MI7ZOGo_8!)xwrlDGG;O}whO*IHM
zj3Zr^a4gPuP&d+_pco7zz`MQ1JC2b3_3}utl$YWT;o<h@o(iTu?IkHVS+dP(k|GJ|
zp~t9a7>}E|?BvvB2-S;z^q>l{VJ28Pr%^2FqK0F7k;79%{ec*JwTb}0taDcv`$ulV
z1L6EvVMxs^JVIHjpvwMQ=P-+HN3g6cd9e$Rz#g9px$VS$aB6BW@&W?>=u5PdGC`mM
zJPWN=Z0IEAB@Bn0^ED)v)d2D=c6of&{)lfa2)9-rUY|2^=<4Fg=VmyN<{7(^Y+l6F
zXEPYHc~Hj6vhW(q-zTfPs7i?XY#}Wcp9$9Boekka=z}y5n|Ar#Xk-(oTz?$2%qy~$
z3O31%m&001Yl44Jl3_>ERZkzem-0rnNi<O!z=W|fwJs=xEDTRauTbN61bAq2T$XOa
zI!SEeM>OG@O;szt?Klr!5TeQ*{s(YR3Td-XJ7b^5_XAX&`1ASR3xp_Xt&#0JoumQ5
z<BhbY-<u!1@*^=k^Z`7Amis>=(M6^jaB*JXnN%caq4iX)3;jg<tT&p?8uCu$nMRVT
zjb)=d2%U$Re&k1DNzHtH?3rWV53aD|UQhM2y`4=Ffw$|8Vfi=ay!m>PGyA?&lqD`R
z59hrhDC=ED<-BSxBldRq1wui?;zGo;1hU<jYH`EQns=vERo7UlM0n(=U8jl+JYY{t
z%jwVj6R{K(Q%Z(yBNC+T#2bp>@{jws?a76vk2yll#f9MH#dYyHD#z!FrcJ6Ujs6=f
zIcvjEk>Lr}k*JcNUxF-79cN*jN4STJmNnZZiNZH-$T0hM;d`aCrAAl!0*BvD*dRTA
zB(k<!2yXIhlCHn$i<{@9I-)>&RxK;okrN{D5q_?E2id$5R8_wYQq`~Z62IzdjrF+D
z2)ujkfCrfvf_ci@UCCmB?yaqeWb>w{xZ}q)p4_+~1u7W1pTbp;eW5pM&1MxoKg+#t
z1}im|pP<!^$IO^JV}E!6^S^BE_xDS)Q!k_E-~HPPkQJ&Y{Y9vElM7j+Ry!R3dSjYw
z!D$w~joN%sr;IO*SIsLyzT12lwbD3Fbz!ps*YLl4`fI~(gRm(@#EdsxrHQKgV)s9V
zi;sF>Vh;k|2zh?96`vjTxZfYqT6OKb^STLdrOQ|kmijblz@^g2-(j(|Xhr3|@@m~A
zYb&4q#MnVD9{n$at+<~cKC7D~$Y{2qpsK?&##S7tHo}ZohTw<mMfA^i!so72r>!N|
z?!zUWMIvYa8Ql2keBWW<zbiK~+S8=}XNmttfBxtuvLR<6&VQ%wQSyG|Q3d(u++>*&
zhT3hk=3p<MJnu-xpW2eW+3zUGw&w5KF?Ol!^BYgYssb)8x8TT5E?#w#iO=f4G+7(B
z-y)n%xmvsw59aZU-5c-!07ho;BzXK^Oz}Ti)+O`h#-XccW7x<JPf~cUQBS4Fndi4l
zyyYJUP@&o511Q~v|Ic@V=cij(H^%}Y%X?zP9ebZ-ed7E3btd2I=uUjs!_Lro?^kuJ
z<C&`DUtr_gsION7N~;wjzKWj%J|P|`3ks?&uWV8E9=f`4yn-csza*r-U0YmH;kLYo
zkAG~oPBA-l{)vf@0d_z=aH-lKcfrn}+-z8M&~8MK*wr#NdA_o*4`bb}vQJ+;WW2UW
z*(ooAE%z=QAi`VGEA8sz$U}}>Wj|><UxaVb5@H<pEK4ILPC-9v9({9^--wvrVjeuM
zaK_uzD-!br(Lja3o%rO`$e=vb+fqyl;c6OaivEPCCHWUT(o!4;SIZSF!EYe=7dVCF
zo_Zib!dlGVVE^8}lCDPoW0~mevqPt)y5m#-?Tvoi&)OXq?kkAtjp&t-#^ZZtp5C!i
z2_=`w98g&5OJ34ptffVfG3V!SS-V(9Whg>y$?T$6dr5y55m??N+LO^s+Fpy*sXnQ$
z+*{VDnPT0v4_de%oGxiWx5)|)gWu{e<JER6v<sOB6>I*1sT}Go+z)h!kIYUeZSoRY
ze!|;1FF0ZvBE#5!As_eh>jmmje90Ur$RWRzJWMU=TqpVuZ2NLwKD9y8t{+ywdH0C4
zw9_49MJK7mwQ!HCosYU_NHM3eshRBBpJQnmv{AQI+rge9CKsEXpa}K!W@j^Mv2duS
z3|gz+7uB6IGYE(YfO8mbAm;ZJk0i_><H)Ficdw%6_Dwr7<s`eSr!ZDK7&4@y6<Q7>
z;CSgng4RxN{-zk<sH&<}%%8hwq$3x$SKD@SN@~f#D>5+ln4<2CWPe0030dGL)X6!s
zr8i#Xfsw!NelXivxkJ>BGhy2JI9<t5b(_J4`{Dv^b7qOlxoW>5S4d~qgG%k%57!*~
zn&;)OdKKpXn#!)tKYTaQj;IINGI??G8D~~7yzaNl$tvv$vjV*g%HppBk0EN`e&2sU
z{vfr9;-QNzQ6Fa8c7;h>-P^{C9qbfV{uCfObUEsV65PsYP%wiF1}U$p9~uG+w(@ZW
z$Eaih8ecRUNSk?+hO*ZifR3NhELuAlYy`QE`L3*9cD&gN|9`H3U$`Jg+0mv-g`p}}
z5s2pb?jsAmhE%}<kCVvHMKdZ?S|aXplh1bO!wRSyAHMl?93?YKXcSpBis;T<4`7x1
zv3|a&cGw!1_2$rHKkxMCA7OrspCfMWl}@!Np{f!44=Q7q(Tumz>6bQ#nv0DO-@3Po
zsmM9=@q;y9gt0?O{ej<bi`%7Sz+C31z*d(+;WI#+S8FF1lbK*Py#)i%SyydHCI8Ip
z&Wg_hG^@i#5&2?4t<{#cC_wDwZyvupXAL?K_pR@_Hqw!WV6L%63aA-rbmifCYlp4<
zv#7-kI8m@3EpX+@c7JRA^_8yzimkHsNRBIOcIv#Su=0!xs?d^zgI+__P{}-aCSV*h
z4t-AV!tE&Cl{&jZ33<!s>}z<Fu(y1zSgq8I#kwbFAK^f*#YM!sGr#m>Oj4X0gIe}l
uu3ElYA(v4B2D!+Gzn=!D$ZMF(OEe(#4Y^NsS*X=j|K+5VC5y$uKK~0nD;oU(

literal 0
HcmV?d00001

diff --git a/browser/themes/shared/incontentprefs/preferences.inc.css b/browser/themes/shared/incontentprefs/preferences.inc.css
index 97ac7cebbfc..262b4b317ec 100644
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -223,32 +223,6 @@ description > html|a {
   cursor: pointer;
 }
 
-#fxaProfileImage {
-  width: 60px;
-  height: 60px;
-  border-radius: 50%;
-  border-width: 5px;
-  border-color: red;
-  background-image: url(chrome://browser/skin/fxa/default-profile-image.svg);
-  background-size: contain;
-  cursor: pointer;
-  -moz-margin-end: 15px;
-}
-
-#fxaProfileImage:hover {
-  box-shadow: 0px 0px 0px 1px #0095DD;
-}
-
-#fxaProfileImage:active {
-  box-shadow: 0px 0px 0px 1px #ff9500;
-}
-
-#noFxaAccount {
-  /* Overriding the margins from the base preferences.css theme file.
-     These overrides can be simplified by fixing bug 1027174 */
-  margin: 0;
-}
-
 #weavePrefsDeck > vbox > label,
 #weavePrefsDeck > vbox > groupbox,
 #weavePrefsDeck > vbox > description,
@@ -397,16 +371,123 @@ description > html|a {
  * Sync
  */
 
+#fxaProfileImage {
+  width: 60px;
+  max-height: 60px;
+  border-radius: 50%;
+  background-image: url(chrome://browser/skin/fxa/default-avatar.png);
+  background-size: contain;
+  margin-inline-end: 15px;
+}
+
+#fxaProfileImage.actionable {
+  cursor: pointer;
+}
+
+#fxaProfileImage.actionable:hover {
+  box-shadow: 0px 0px 0px 1px #0095DD;
+}
+
+#fxaProfileImage.actionable:hover:active {
+  box-shadow: 0px 0px 0px 1px #ff9500;
+}
+
+#noFxaAccount {
+  /* Overriding the margins from the base preferences.css theme file.
+     These overrides can be simplified by fixing bug 1027174 */
+  margin: 0;
+}
+
+#noFxaGroup {
+  -moz-box-flex: 1;
+}
+
+#noFxaGroup > vbox {
+  -moz-box-align: start;
+}
+
 #fxaSyncEngines > vbox:first-child {
   margin-right: 80px;
 }
 
 #fxaSyncComputerName {
-  margin-left: 0px;
+  margin-inline-start: 0px;
+  width: 500px;
 }
 
 #tosPP-small-ToS {
-  margin-bottom: 1em;
+  margin-bottom: 14px;
+}
+
+#noFxaCaption {
+  font-weight: bold;
+  margin-bottom: 11px;
+}
+
+.fxaSyncIllustration {
+  margin-top: 35px;
+}
+
+#syncOptions caption {
+  margin-bottom: 11px;
+}
+
+#fxaDeviceName {
+  margin-bottom: 27.5px;
+}
+
+#noFxaDescription {
+  margin-bottom: 20px !important;
+}
+
+.separator {
+  border-bottom: 1px solid var(--in-content-header-border-color);
+}
+
+.fxaAccountBox {
+  border: 1px solid #D1D2D3;
+  border-radius: 5px;
+  padding: 14px 20px 14px 14px;
+}
+
+#signedOutAccountBoxTitle {
+  margin-inline-start: 6px !important;
+  font-weight: bold;
+  margin-bottom: 11px;
+}
+
+.fxaAccountBox button {
+  padding-left: 11px;
+  padding-right: 11px;
+}
+
+.fxaSyncIllustration {
+  width: 231px;
+  max-height: 200px;
+  list-style-image: url(chrome://browser/skin/fxa/sync-illustration.png)
+}
+
+.fxaFirefoxLogo {
+  list-style-image: url(chrome://browser/skin/fxa/logo.png);
+  max-width: 64px;
+  margin-inline-end: 14px;
+}
+
+#noFxaAccount .fxaMobilePromo {
+  margin-bottom: 55px;
+}
+
+#hasFxaAccount .fxaMobilePromo {
+  margin-bottom: 41px;
+  margin-top: 27.5px;
+}
+
+.fxaMobilePromo > label {
+  margin-inline-start: 0;
+}
+
+#hasFxaAccount .fxaAccountBoxButtons {
+  margin-top: 11px;
 }
 
 #fxaLoginRejectedWarning {
@@ -414,3 +495,38 @@ description > html|a {
   filter: drop-shadow(0 1px 0 hsla(206, 50%, 10%, .15));
   margin: 4px 8px 0px 0px;
 }
+
+#syncOptions {
+  margin-bottom: 27.5px;
+}
+
+.androidLogo {
+  list-style-image: url(chrome://browser/skin/fxa/android.png);
+  max-width: 24px;
+  margin-top: -4px;
+  margin-inline-end: 4px;
+}
+
+#tosPP-small {
+  margin-bottom: 20px;
+}
+
+.androidAttribution {
+  font-size: 12px;
+  color: #D1D2D3;
+}
+
+@media (min-resolution: 1.1dppx) {
+  .fxaSyncIllustration {
+    list-style-image: url(chrome://browser/skin/fxa/sync-illustration@2x.png)
+  }
+  .fxaFirefoxLogo {
+    list-style-image: url(chrome://browser/skin/fxa/logo@2x.png);
+  }
+  .androidLogo {
+    list-style-image: url(chrome://browser/skin/fxa/android@2x.png);
+  }
+  #fxaProfileImage {
+    background-image: url(chrome://browser/skin/fxa/default-avatar@2x.png);
+  }
+}
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index e9c58e331a8..bd152435bf5 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -307,7 +307,14 @@ browser.jar:
         skin/classic/browser/preferences/in-content/favicon.ico      (../shared/incontentprefs/favicon.ico)
         skin/classic/browser/preferences/in-content/icons.svg        (../shared/incontentprefs/icons.svg)
         skin/classic/browser/preferences/in-content/search.css       (../shared/incontentprefs/search.css)
-        skin/classic/browser/fxa/default-profile-image.svg   (../shared/fxa/default-profile-image.svg)
+        skin/classic/browser/fxa/default-avatar.png                  (../shared/fxa/default-avatar.png)
+        skin/classic/browser/fxa/default-avatar@2x.png               (../shared/fxa/default-avatar@2x.png)
+        skin/classic/browser/fxa/logo.png                            (../shared/fxa/logo.png)
+        skin/classic/browser/fxa/logo@2x.png                         (../shared/fxa/logo@2x.png)
+        skin/classic/browser/fxa/sync-illustration.png               (../shared/fxa/sync-illustration.png)
+        skin/classic/browser/fxa/sync-illustration@2x.png            (../shared/fxa/sync-illustration@2x.png)
+        skin/classic/browser/fxa/android.png                         (../shared/fxa/android.png)
+        skin/classic/browser/fxa/android@2x.png                      (../shared/fxa/android@2x.png)
         skin/classic/browser/preferences/applications.css            (preferences/applications.css)
         skin/classic/browser/preferences/aboutPermissions.css        (preferences/aboutPermissions.css)
         skin/classic/browser/preferences/search.css                  (preferences/search.css)

From fb86187ad49f593aba2c41c6f5a616310a00caeb Mon Sep 17 00:00:00 2001
From: Julian Descottes <julian.descottes@gmail.com>
Date: Tue, 4 Aug 2015 23:26:29 -0700
Subject: [PATCH 02/56] Bug 1152721 - Extract styleinspector common methods to
 utils.js, r=mratcliffe

---
 .../shared/test/unit/test_advanceValidate.js  |   4 +-
 .../devtools/styleinspector/computed-view.js  |  39 +---
 browser/devtools/styleinspector/moz.build     |   1 +
 browser/devtools/styleinspector/rule-view.js  | 129 ++------------
 browser/devtools/styleinspector/utils.js      | 166 ++++++++++++++++++
 5 files changed, 185 insertions(+), 154 deletions(-)
 create mode 100644 browser/devtools/styleinspector/utils.js

diff --git a/browser/devtools/shared/test/unit/test_advanceValidate.js b/browser/devtools/shared/test/unit/test_advanceValidate.js
index 87194376aac..7f86010b0b8 100644
--- a/browser/devtools/shared/test/unit/test_advanceValidate.js
+++ b/browser/devtools/shared/test/unit/test_advanceValidate.js
@@ -11,7 +11,7 @@ const Cu = Components.utils;
 const Ci = Components.interfaces;
 let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let require = devtools.require;
-let {_advanceValidate} = require("devtools/styleinspector/rule-view");
+let {advanceValidate} = require("devtools/styleinspector/rule-view");
 
 //                            1         2         3
 //                  0123456789012345678901234567890
@@ -19,7 +19,7 @@ let sampleInput = '\\symbol "string" url(somewhere)';
 
 function testInsertion(where, result, testName) {
   do_print(testName);
-  equal(_advanceValidate(Ci.nsIDOMKeyEvent.DOM_VK_SEMICOLON, sampleInput, where),
+  equal(advanceValidate(Ci.nsIDOMKeyEvent.DOM_VK_SEMICOLON, sampleInput, where),
         result, "testing _advanceValidate at " + where);
 }
 
diff --git a/browser/devtools/styleinspector/computed-view.js b/browser/devtools/styleinspector/computed-view.js
index 15463830270..2fe90a34565 100644
--- a/browser/devtools/styleinspector/computed-view.js
+++ b/browser/devtools/styleinspector/computed-view.js
@@ -15,8 +15,10 @@ const ToolDefinitions = require("main").Tools;
 const {CssLogic} = require("devtools/styleinspector/css-logic");
 const {ELEMENT_STYLE} = require("devtools/server/actors/styles");
 const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const {setTimeout, clearTimeout} = Cu.import("resource://gre/modules/Timer.jsm", {});
 const {OutputParser} = require("devtools/output-parser");
 const {PrefObserver, PREF_ORIG_SOURCES} = require("devtools/styleeditor/utils");
+const {createChild} = require("devtools/styleinspector/utils");
 const {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 
 loader.lazyRequireGetter(this, "overlays", "devtools/styleinspector/style-inspector-overlays");
@@ -70,7 +72,7 @@ UpdateProcess.prototype = {
     if (this.canceled) {
       return;
     }
-    this._timeout = this.win.setTimeout(this._timeoutHandler.bind(this), 0);
+    this._timeout = setTimeout(this._timeoutHandler.bind(this), 0);
   },
 
   /**
@@ -79,7 +81,7 @@ UpdateProcess.prototype = {
    */
   cancel: function() {
     if (this._timeout) {
-      this.win.clearTimeout(this._timeout);
+      clearTimeout(this._timeout);
       this._timeout = 0;
     }
     this.canceled = true;
@@ -508,17 +510,15 @@ CssComputedView.prototype = {
    * @param {Event} aEvent the DOM Event object.
    */
   _onFilterStyles: function(aEvent) {
-    let win = this.styleWindow;
-
     if (this._filterChangedTimeout) {
-      win.clearTimeout(this._filterChangedTimeout);
+      clearTimeout(this._filterChangedTimeout);
     }
 
     let filterTimeout = (this.searchField.value.length > 0)
       ? FILTER_CHANGED_TIMEOUT : 0;
     this.searchClearButton.hidden = this.searchField.value.length === 0;
 
-    this._filterChangedTimeout = win.setTimeout(() => {
+    this._filterChangedTimeout = setTimeout(() => {
       if (this.searchField.value.length > 0) {
         this.searchField.setAttribute("filled", true);
       } else {
@@ -1386,32 +1386,5 @@ SelectorView.prototype = {
   }
 };
 
-/**
- * Create a child element with a set of attributes.
- *
- * @param {Element} aParent
- *        The parent node.
- * @param {string} aTag
- *        The tag name.
- * @param {object} aAttributes
- *        A set of attributes to set on the node.
- */
-function createChild(aParent, aTag, aAttributes={}) {
-  let elt = aParent.ownerDocument.createElementNS(HTML_NS, aTag);
-  for (let attr in aAttributes) {
-    if (aAttributes.hasOwnProperty(attr)) {
-      if (attr === "textContent") {
-        elt.textContent = aAttributes[attr];
-      } else if (attr === "child") {
-        elt.appendChild(aAttributes[attr]);
-      } else {
-        elt.setAttribute(attr, aAttributes[attr]);
-      }
-    }
-  }
-  aParent.appendChild(elt);
-  return elt;
-}
-
 exports.CssComputedView = CssComputedView;
 exports.PropertyView = PropertyView;
diff --git a/browser/devtools/styleinspector/moz.build b/browser/devtools/styleinspector/moz.build
index e50d91589b8..b0ffaa71c3e 100644
--- a/browser/devtools/styleinspector/moz.build
+++ b/browser/devtools/styleinspector/moz.build
@@ -14,4 +14,5 @@ EXTRA_JS_MODULES.devtools.styleinspector += [
     'style-inspector-menu.js',
     'style-inspector-overlays.js',
     'style-inspector.js',
+    'utils.js',
 ]
diff --git a/browser/devtools/styleinspector/rule-view.js b/browser/devtools/styleinspector/rule-view.js
index 6624246c3ce..93f417fc7c0 100644
--- a/browser/devtools/styleinspector/rule-view.js
+++ b/browser/devtools/styleinspector/rule-view.js
@@ -12,6 +12,8 @@
 
 const {Cc, Ci, Cu} = require("chrome");
 const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const {setTimeout, clearTimeout} =
+      Cu.import("resource://gre/modules/Timer.jsm", {});
 const {CssLogic} = require("devtools/styleinspector/css-logic");
 const {InplaceEditor, editableField, editableItem} =
       require("devtools/shared/inplace-editor");
@@ -19,6 +21,14 @@ const {ELEMENT_STYLE, PSEUDO_ELEMENTS} =
       require("devtools/server/actors/styles");
 const {OutputParser} = require("devtools/output-parser");
 const {PrefObserver, PREF_ORIG_SOURCES} = require("devtools/styleeditor/utils");
+const {
+  createChild,
+  appendText,
+  advanceValidate,
+  blurOnMultipleProperties,
+  promiseWarn,
+  throttle
+} = require("devtools/styleinspector/utils");
 const {
   parseDeclarations,
   parseSingleValue,
@@ -27,7 +37,6 @@ const {
   SELECTOR_ELEMENT,
   SELECTOR_PSEUDO_CLASS
 } = require("devtools/styleinspector/css-parsing-utils");
-
 loader.lazyRequireGetter(this, "overlays", "devtools/styleinspector/style-inspector-overlays");
 loader.lazyRequireGetter(this, "EventEmitter", "devtools/toolkit/event-emitter");
 loader.lazyRequireGetter(this, "StyleInspectorMenu", "devtools/styleinspector/style-inspector-menu");
@@ -50,11 +59,6 @@ const FILTER_PROP_RE = /\s*([^:\s]*)\s*:\s*(.*?)\s*;?$/;
 const IOService = Cc["@mozilla.org/network/io-service;1"]
                   .getService(Ci.nsIIOService);
 
-function promiseWarn(err) {
-  console.error(err);
-  return promise.reject(err);
-}
-
 /**
  * To figure out how shorthand properties are interpreted by the
  * engine, we will set properties on a dummy element and observe
@@ -3608,77 +3612,6 @@ UserProperties.prototype = {
  * Helper functions
  */
 
-/**
- * Create a child element with a set of attributes.
- *
- * @param {Element} aParent
- *        The parent node.
- * @param {string} aTag
- *        The tag name.
- * @param {object} aAttributes
- *        A set of attributes to set on the node.
- */
-function createChild(aParent, aTag, aAttributes) {
-  let elt = aParent.ownerDocument.createElementNS(HTML_NS, aTag);
-  for (let attr in aAttributes) {
-    if (aAttributes.hasOwnProperty(attr)) {
-      if (attr === "textContent") {
-        elt.textContent = aAttributes[attr];
-      } else if (attr === "child") {
-        elt.appendChild(aAttributes[attr]);
-      } else {
-        elt.setAttribute(attr, aAttributes[attr]);
-      }
-    }
-  }
-  aParent.appendChild(elt);
-  return elt;
-}
-
-function setTimeout() {
-  let window = Services.appShell.hiddenDOMWindow;
-  return window.setTimeout.apply(window, arguments);
-}
-
-function clearTimeout() {
-  let window = Services.appShell.hiddenDOMWindow;
-  return window.clearTimeout.apply(window, arguments);
-}
-
-function throttle(func, wait, scope) {
-  let timer = null;
-  return function() {
-    if (timer) {
-      clearTimeout(timer);
-    }
-    let args = arguments;
-    timer = setTimeout(function() {
-      timer = null;
-      func.apply(scope, args);
-    }, wait);
-  };
-}
-
-/**
- * Event handler that causes a blur on the target if the input has
- * multiple CSS properties as the value.
- */
-function blurOnMultipleProperties(e) {
-  setTimeout(() => {
-    let props = parseDeclarations(e.target.value);
-    if (props.length > 1) {
-      e.target.blur();
-    }
-  }, 0);
-}
-
-/**
- * Append a text node to an element.
- */
-function appendText(aParent, aText) {
-  aParent.appendChild(aParent.ownerDocument.createTextNode(aText));
-}
-
 /**
  * Walk up the DOM from a given node until a parent property holder is found.
  * For elements inside the computed property list, the non-computed parent
@@ -3742,48 +3675,6 @@ function getPropertyNameAndValue(node) {
   }
 }
 
-/**
- * Called when a character is typed in a value editor.  This decides
- * whether to advance or not, first by checking to see if ";" was
- * typed, and then by lexing the input and seeing whether the ";"
- * would be a terminator at this point.
- *
- * @param {number} aKeyCode Key code to be checked.
- * @param {String} aValue   Current text editor value.
- * @param {number} aInsertionPoint The index of the insertion point.
- * @return {Boolean} True if the focus should advance; false if
- *        the character should be inserted.
- */
-function advanceValidate(aKeyCode, aValue, aInsertionPoint) {
-  // Only ";" has special handling here.
-  if (aKeyCode !== Ci.nsIDOMKeyEvent.DOM_VK_SEMICOLON) {
-    return false;
-  }
-
-  // Insert the character provisionally and see what happens.  If we
-  // end up with a ";" symbol token, then the semicolon terminates the
-  // value.  Otherwise it's been inserted in some spot where it has a
-  // valid meaning, like a comment or string.
-  aValue = aValue.slice(0, aInsertionPoint) + ";" +
-    aValue.slice(aInsertionPoint);
-  let lexer = domUtils.getCSSLexer(aValue);
-  while (true) {
-    let token = lexer.nextToken();
-    if (token.endOffset > aInsertionPoint) {
-      if (token.tokenType === "symbol" && token.text === ";") {
-        // The ";" is a terminator.
-        return true;
-      }
-      // The ";" is not a terminator in this context.
-      break;
-    }
-  }
-  return false;
-}
-
-// We're exporting _advanceValidate for unit tests.
-exports._advanceValidate = advanceValidate;
-
 XPCOMUtils.defineLazyGetter(this, "clipboardHelper", function() {
   return Cc["@mozilla.org/widget/clipboardhelper;1"]
     .getService(Ci.nsIClipboardHelper);
diff --git a/browser/devtools/styleinspector/utils.js b/browser/devtools/styleinspector/utils.js
new file mode 100644
index 00000000000..5085ac0e4fe
--- /dev/null
+++ b/browser/devtools/styleinspector/utils.js
@@ -0,0 +1,166 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* 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/. */
+
+/* global domUtils */
+
+"use strict";
+
+const {Cc, Ci, Cu} = require("chrome");
+const {setTimeout, clearTimeout} =
+      Cu.import("resource://gre/modules/Timer.jsm", {});
+const {parseDeclarations} =
+      require("devtools/styleinspector/css-parsing-utils");
+const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+
+loader.lazyServiceGetter(this, "domUtils",
+  "@mozilla.org/inspector/dom-utils;1", "inIDOMUtils");
+
+const HTML_NS = "http://www.w3.org/1999/xhtml";
+
+/**
+ * Create a child element with a set of attributes.
+ *
+ * @param {Element} parent
+ *        The parent node.
+ * @param {string} tagName
+ *        The tag name.
+ * @param {object} attributes
+ *        A set of attributes to set on the node.
+ */
+function createChild(parent, tagName, attributes={}) {
+  let elt = parent.ownerDocument.createElementNS(HTML_NS, tagName);
+  for (let attr in attributes) {
+    if (attributes.hasOwnProperty(attr)) {
+      if (attr === "textContent") {
+        elt.textContent = attributes[attr];
+      } else if (attr === "child") {
+        elt.appendChild(attributes[attr]);
+      } else {
+        elt.setAttribute(attr, attributes[attr]);
+      }
+    }
+  }
+  parent.appendChild(elt);
+  return elt;
+}
+
+exports.createChild = createChild;
+
+/**
+ * Append a text node to an element.
+ *
+ * @param {Element} parent
+ *        The parent node.
+ * @param {string} text
+ *        The text content for the text node.
+ */
+function appendText(parent, text) {
+  parent.appendChild(parent.ownerDocument.createTextNode(text));
+}
+
+exports.appendText = appendText;
+
+/**
+ * Called when a character is typed in a value editor.  This decides
+ * whether to advance or not, first by checking to see if ";" was
+ * typed, and then by lexing the input and seeing whether the ";"
+ * would be a terminator at this point.
+ *
+ * @param {number} keyCode
+ *        Key code to be checked.
+ * @param {string} aValue
+ *        Current text editor value.
+ * @param {number} insertionPoint
+ *        The index of the insertion point.
+ * @return {Boolean} True if the focus should advance; false if
+ *        the character should be inserted.
+ */
+function advanceValidate(keyCode, value, insertionPoint) {
+  // Only ";" has special handling here.
+  if (keyCode !== Ci.nsIDOMKeyEvent.DOM_VK_SEMICOLON) {
+    return false;
+  }
+
+  // Insert the character provisionally and see what happens.  If we
+  // end up with a ";" symbol token, then the semicolon terminates the
+  // value.  Otherwise it's been inserted in some spot where it has a
+  // valid meaning, like a comment or string.
+  value = value.slice(0, insertionPoint) + ";" + value.slice(insertionPoint);
+  let lexer = domUtils.getCSSLexer(value);
+  while (true) {
+    let token = lexer.nextToken();
+    if (token.endOffset > insertionPoint) {
+      if (token.tokenType === "symbol" && token.text === ";") {
+        // The ";" is a terminator.
+        return true;
+      }
+      // The ";" is not a terminator in this context.
+      break;
+    }
+  }
+  return false;
+}
+
+exports.advanceValidate = advanceValidate;
+
+/**
+ * Create a throttling function wrapper to regulate its frequency.
+ *
+ * @param {Function} func
+ *         The function to throttle
+ * @param {number} wait
+ *         The throttling period
+ * @param {Object} scope
+ *         The scope to use for func
+ * @return {Function} The throttled function
+ */
+function throttle(func, wait, scope) {
+  let timer = null;
+
+  return function() {
+    if (timer) {
+      clearTimeout(timer);
+    }
+
+    let args = arguments;
+    timer = setTimeout(function() {
+      timer = null;
+      func.apply(scope, args);
+    }, wait);
+  };
+}
+
+exports.throttle = throttle;
+
+/**
+ * Event handler that causes a blur on the target if the input has
+ * multiple CSS properties as the value.
+ */
+function blurOnMultipleProperties(e) {
+  setTimeout(() => {
+    let props = parseDeclarations(e.target.value);
+    if (props.length > 1) {
+      e.target.blur();
+    }
+  }, 0);
+}
+
+exports.blurOnMultipleProperties = blurOnMultipleProperties;
+
+/**
+ * Log the provided error to the console and return a rejected Promise for
+ * this error.
+ *
+ * @param {Error} error
+ *         The error to log
+ * @return {Promise} A rejected promise
+ */
+function promiseWarn(error) {
+  console.error(error);
+  return promise.reject(error);
+}
+
+exports.promiseWarn = promiseWarn;

From 6453cab3e4aa240550675a688525cfa6324b7a17 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Tue, 4 Aug 2015 22:55:21 -0700
Subject: [PATCH 03/56] Bug 1185579 - UITour: Make the "accountStatus" target
 use the FxA avatar when logged in. r=markh

---
 browser/components/uitour/UITour.jsm          |  9 +++
 browser/components/uitour/test/browser.ini    |  2 +
 browser/components/uitour/test/browser_fxa.js | 68 +++++++++++++++++++
 browser/components/uitour/test/head.js        |  6 ++
 4 files changed, 85 insertions(+)
 create mode 100644 browser/components/uitour/test/browser_fxa.js

diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm
index 19d804deb40..9c143ff1a8a 100644
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@@ -98,11 +98,20 @@ this.UITour = {
   targets: new Map([
     ["accountStatus", {
       query: (aDocument) => {
+        // If the user is logged in, use the avatar element.
+        let fxAFooter = aDocument.getElementById("PanelUI-footer-fxa");
+        if (fxAFooter.getAttribute("fxastatus")) {
+          return aDocument.getElementById("PanelUI-fxa-avatar");
+        }
+
+        // Otherwise use the sync setup icon.
         let statusButton = aDocument.getElementById("PanelUI-fxa-label");
         return aDocument.getAnonymousElementByAttribute(statusButton,
                                                         "class",
                                                         "toolbarbutton-icon");
       },
+      // This is a fake widgetName starting with the "PanelUI-" prefix so we know
+      // to automatically open the appMenu when annotating this target.
       widgetName: "PanelUI-fxa-label",
     }],
     ["addons",      {query: "#add-ons-button"}],
diff --git a/browser/components/uitour/test/browser.ini b/browser/components/uitour/test/browser.ini
index cb3d5fc4e27..056ff98be22 100644
--- a/browser/components/uitour/test/browser.ini
+++ b/browser/components/uitour/test/browser.ini
@@ -7,6 +7,8 @@ support-files =
 
 [browser_backgroundTab.js]
 skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly
+[browser_fxa.js]
+skip-if = e10s # Bug 1073247 - UITour tests not e10s friendly
 [browser_no_tabs.js]
 [browser_openPreferences.js]
 skip-if = e10s # Bug 1073247 - UITour tests not e10s friendly
diff --git a/browser/components/uitour/test/browser_fxa.js b/browser/components/uitour/test/browser_fxa.js
new file mode 100644
index 00000000000..802c747d6b0
--- /dev/null
+++ b/browser/components/uitour/test/browser_fxa.js
@@ -0,0 +1,68 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts",
+                                  "resource://gre/modules/FxAccounts.jsm");
+
+let gTestTab;
+let gContentAPI;
+let gContentWindow;
+
+function test() {
+  UITourTest();
+}
+
+registerCleanupFunction(function*() {
+  yield signOut();
+  gFxAccounts.updateAppMenuItem();
+});
+
+let tests = [
+  taskify(function* test_highlight_accountStatus_loggedOut() {
+    let userData = yield fxAccounts.getSignedInUser();
+    is(userData, null, "Not logged in initially");
+    yield showMenuPromise("appMenu");
+    yield showHighlightPromise("accountStatus");
+    let highlight = document.getElementById("UITourHighlightContainer");
+    is(highlight.getAttribute("targetName"), "accountStatus", "Correct highlight target");
+  }),
+
+  taskify(function* test_highlight_accountStatus_loggedIn() {
+    yield setSignedInUser();
+    let userData = yield fxAccounts.getSignedInUser();
+    isnot(userData, null, "Logged in now");
+    gFxAccounts.updateAppMenuItem();
+    yield showMenuPromise("appMenu");
+    yield showHighlightPromise("accountStatus");
+    let highlight = document.getElementById("UITourHighlightContainer");
+    is(highlight.popupBoxObject.anchorNode.id, "PanelUI-fxa-avatar", "Anchored on avatar");
+    is(highlight.getAttribute("targetName"), "accountStatus", "Correct highlight target");
+  }),
+];
+
+// Helpers copied from browser_aboutAccounts.js
+// watch out - these will fire observers which if you aren't careful, may
+// interfere with the tests.
+function setSignedInUser(data) {
+  if (!data) {
+    data = {
+      email: "foo@example.com",
+      uid: "1234@lcip.org",
+      assertion: "foobar",
+      sessionToken: "dead",
+      kA: "beef",
+      kB: "cafe",
+      verified: true
+    };
+  }
+ return fxAccounts.setSignedInUser(data);
+}
+
+function signOut() {
+  // we always want a "localOnly" signout here...
+  return fxAccounts.signOut(true);
+}
diff --git a/browser/components/uitour/test/head.js b/browser/components/uitour/test/head.js
index 4ebe214beda..81161a0343e 100644
--- a/browser/components/uitour/test/head.js
+++ b/browser/components/uitour/test/head.js
@@ -139,6 +139,12 @@ function showInfoPromise(...args) {
   return promisePanelElementShown(window, popup);
 }
 
+function showHighlightPromise(...args) {
+  let popup = document.getElementById("UITourHighlightContainer");
+  gContentAPI.showHighlight.apply(gContentAPI, args);
+  return promisePanelElementShown(window, popup);
+}
+
 function showMenuPromise(name) {
   return new Promise(resolve => {
     gContentAPI.showMenu(name, () => resolve());

From 6189cda06ff3873c1dd15e1e70fe666af80caead Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Tue, 4 Aug 2015 20:27:49 +0200
Subject: [PATCH 04/56] Bug 1190597 - isRestrictedProfile() should check app
 and user restrictions. r=ally

---
 mobile/android/base/RestrictedProfiles.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/RestrictedProfiles.java b/mobile/android/base/RestrictedProfiles.java
index 6d45c33d39d..ec8dc6e9912 100644
--- a/mobile/android/base/RestrictedProfiles.java
+++ b/mobile/android/base/RestrictedProfiles.java
@@ -62,7 +62,9 @@ public class RestrictedProfiles {
         }
 
         final UserManager mgr = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        Bundle restrictions = mgr.getApplicationRestrictions(context.getPackageName());
+        final Bundle restrictions = new Bundle();
+        restrictions.putAll(mgr.getApplicationRestrictions(context.getPackageName()));
+        restrictions.putAll(mgr.getUserRestrictions());
 
         for (String key : restrictions.keySet()) {
             if (restrictions.getBoolean(key)) {

From c39992a0a65365302577936cedd0f374e6a857df Mon Sep 17 00:00:00 2001
From: Tim Taubert <ttaubert@mozilla.com>
Date: Wed, 29 Jul 2015 14:57:35 +0200
Subject: [PATCH 05/56] Bug 1031661 - Apply correct zoom level to preloaded
 content like about:newtab r=dao

---
 browser/base/content/tabbrowser.xml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 43826467537..18bd33a711f 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -563,8 +563,20 @@
         <parameter name="aTab"/>
         <parameter name="aBrowser"/>
         <parameter name="aStartsBlank"/>
+        <parameter name="aWasPreloadedBrowser"/>
         <body>
         <![CDATA[
+          let stateFlags = 0;
+          // Initialize mStateFlags to non-zero e.g. when creating a progress
+          // listener for preloaded browsers as there was no progress listener
+          // around when the content started loading. If the content didn't
+          // quite finish loading yet, mStateFlags will very soon be overridden
+          // with the correct value and end up at STATE_STOP again.
+          if (aWasPreloadedBrowser) {
+            stateFlags = Ci.nsIWebProgressListener.STATE_STOP |
+                         Ci.nsIWebProgressListener.STATE_IS_REQUEST;
+          }
+
           return ({
             mTabBrowser: this,
             mTab: aTab,
@@ -572,7 +584,7 @@
             mBlank: aStartsBlank,
 
             // cache flags for correct status UI update after tab switching
-            mStateFlags: 0,
+            mStateFlags: stateFlags,
             mStatus: 0,
             mMessage: "",
             mTotalProgress: 0,
@@ -1837,7 +1849,7 @@
             this.tabContainer.updateVisibility();
 
             // wire up a progress listener for the new browser object.
-            var tabListener = this.mTabProgressListener(t, b, uriIsAboutBlank);
+            var tabListener = this.mTabProgressListener(t, b, uriIsAboutBlank, usingPreloadedContent);
             const filter = Components.classes["@mozilla.org/appshell/component/browser-status-filter;1"]
                                      .createInstance(Components.interfaces.nsIWebProgress);
             filter.addProgressListener(tabListener, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
@@ -2549,7 +2561,7 @@
 
             // Restore the progress listener
             this.mTabListeners[index] = tabListener =
-              this.mTabProgressListener(aOurTab, ourBrowser, false);
+              this.mTabProgressListener(aOurTab, ourBrowser, false, false);
 
             const notifyAll = Ci.nsIWebProgress.NOTIFY_ALL;
             filter.addProgressListener(tabListener, notifyAll);
@@ -4028,7 +4040,7 @@
           this.updateWindowResizers();
 
           // Hook up the event listeners to the first browser
-          var tabListener = this.mTabProgressListener(this.mCurrentTab, this.mCurrentBrowser, true);
+          var tabListener = this.mTabProgressListener(this.mCurrentTab, this.mCurrentBrowser, true, false);
           const nsIWebProgress = Components.interfaces.nsIWebProgress;
           const filter = Components.classes["@mozilla.org/appshell/component/browser-status-filter;1"]
                                    .createInstance(nsIWebProgress);

From fa725020b05cb7c2edbcabbe0b773d82a4765619 Mon Sep 17 00:00:00 2001
From: Ben Tian <btian@mozilla.com>
Date: Tue, 4 Aug 2015 17:39:30 +0800
Subject: [PATCH 06/56] Bug 1106007 - Cleanup include guards. r=tzimmermann

---
 dom/bluetooth/BluetoothCommon.h                             | 6 +++---
 dom/bluetooth/BluetoothHidManager.h                         | 6 +++---
 dom/bluetooth/BluetoothInterface.h                          | 6 +++---
 dom/bluetooth/BluetoothProfileManagerBase.h                 | 6 +++---
 dom/bluetooth/BluetoothRilListener.h                        | 6 +++---
 dom/bluetooth/BluetoothSocketObserver.h                     | 2 +-
 dom/bluetooth/BluetoothUtils.h                              | 6 +++---
 dom/bluetooth/BluetoothUuid.h                               | 6 +++---
 dom/bluetooth/ObexBase.h                                    | 6 +++---
 dom/bluetooth/bluedroid/BluetoothA2dpManager.h              | 4 ++--
 dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.h      | 6 +++---
 dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.h     | 6 +++---
 dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.h      | 6 +++---
 dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h | 6 +++---
 dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h            | 6 +++---
 dom/bluetooth/bluedroid/BluetoothDaemonInterface.h          | 6 +++---
 dom/bluetooth/bluedroid/BluetoothDaemonSetupInterface.h     | 6 +++---
 dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.h    | 6 +++---
 dom/bluetooth/bluedroid/BluetoothGattManager.h              | 6 +++---
 dom/bluetooth/bluedroid/BluetoothOppManager.h               | 6 +++---
 dom/bluetooth/bluedroid/BluetoothPbapManager.h              | 6 +++---
 dom/bluetooth/bluedroid/BluetoothServiceBluedroid.h         | 6 +++---
 dom/bluetooth/bluedroid/BluetoothSocket.h                   | 6 +++---
 dom/bluetooth/bluedroid/BluetoothSocketMessageWatcher.h     | 5 +++++
 dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.h  | 6 +++---
 dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h           | 6 +++---
 dom/bluetooth/bluetooth2/BluetoothAdapter.h                 | 6 +++---
 dom/bluetooth/bluetooth2/BluetoothClassOfDevice.h           | 6 +++---
 dom/bluetooth/bluetooth2/BluetoothDevice.h                  | 6 +++---
 dom/bluetooth/bluetooth2/BluetoothDiscoveryHandle.h         | 6 +++---
 dom/bluetooth/bluetooth2/BluetoothGatt.h                    | 6 +++---
 dom/bluetooth/bluetooth2/BluetoothGattCharacteristic.h      | 6 +++---
 dom/bluetooth/bluetooth2/BluetoothGattDescriptor.h          | 6 +++---
 dom/bluetooth/bluetooth2/BluetoothGattServer.h              | 6 +++---
 dom/bluetooth/bluetooth2/BluetoothGattService.h             | 6 +++---
 dom/bluetooth/bluetooth2/BluetoothLeDeviceEvent.h           | 6 +++---
 dom/bluetooth/bluetooth2/BluetoothManager.h                 | 6 +++---
 dom/bluetooth/bluetooth2/BluetoothPairingHandle.h           | 6 +++---
 dom/bluetooth/bluetooth2/BluetoothPairingListener.h         | 6 +++---
 dom/bluetooth/bluetooth2/BluetoothProfileController.h       | 6 +++---
 dom/bluetooth/bluetooth2/BluetoothReplyRunnable.h           | 6 +++---
 dom/bluetooth/bluetooth2/BluetoothService.h                 | 6 +++---
 dom/bluetooth/bluetooth2/ipc/BluetoothChild.h               | 6 +++---
 dom/bluetooth/bluetooth2/ipc/BluetoothMessageUtils.h        | 6 +++---
 dom/bluetooth/bluetooth2/ipc/BluetoothParent.h              | 6 +++---
 dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.h | 6 +++---
 dom/bluetooth/bluez/BluetoothA2dpManager.h                  | 6 +++---
 dom/bluetooth/bluez/BluetoothDBusService.h                  | 6 +++---
 dom/bluetooth/bluez/BluetoothHfpManager.h                   | 6 +++---
 dom/bluetooth/bluez/BluetoothOppManager.h                   | 6 +++---
 dom/bluetooth/bluez/BluetoothSocket.h                       | 6 +++---
 dom/bluetooth/bluez/BluetoothUnixSocketConnector.h          | 6 +++---
 52 files changed, 155 insertions(+), 150 deletions(-)

diff --git a/dom/bluetooth/BluetoothCommon.h b/dom/bluetooth/BluetoothCommon.h
index 21efad2a95a..7aebc1ec3a9 100644
--- a/dom/bluetooth/BluetoothCommon.h
+++ b/dom/bluetooth/BluetoothCommon.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothcommon_h
-#define mozilla_dom_bluetooth_bluetoothcommon_h
+#ifndef mozilla_dom_bluetooth_BluetoothCommon_h
+#define mozilla_dom_bluetooth_BluetoothCommon_h
 
 #include "mozilla/Compiler.h"
 #include "mozilla/Observer.h"
@@ -810,4 +810,4 @@ enum BluetoothGapDataType {
 
 END_BLUETOOTH_NAMESPACE
 
-#endif // mozilla_dom_bluetooth_bluetoothcommon_h__
+#endif // mozilla_dom_bluetooth_BluetoothCommon_h
diff --git a/dom/bluetooth/BluetoothHidManager.h b/dom/bluetooth/BluetoothHidManager.h
index 4d6de810ba7..62fdf29495d 100644
--- a/dom/bluetooth/BluetoothHidManager.h
+++ b/dom/bluetooth/BluetoothHidManager.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothhidmanager_h__
-#define mozilla_dom_bluetooth_bluetoothhidmanager_h__
+#ifndef mozilla_dom_bluetooth_BluetoothHidManager_h
+#define mozilla_dom_bluetooth_BluetoothHidManager_h
 
 #include "BluetoothCommon.h"
 #include "BluetoothProfileController.h"
@@ -46,4 +46,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif //#ifndef mozilla_dom_bluetooth_bluetoothhidmanager_h__
+#endif // mozilla_dom_bluetooth_BluetoothHidManager_h
diff --git a/dom/bluetooth/BluetoothInterface.h b/dom/bluetooth/BluetoothInterface.h
index 58b557978ea..acab86c1039 100644
--- a/dom/bluetooth/BluetoothInterface.h
+++ b/dom/bluetooth/BluetoothInterface.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothinterface_h__
-#define mozilla_dom_bluetooth_bluetoothinterface_h__
+#ifndef mozilla_dom_bluetooth_BluetoothInterface_h
+#define mozilla_dom_bluetooth_BluetoothInterface_h
 
 #include "BluetoothCommon.h"
 #include "mozilla/dom/bluetooth/BluetoothTypes.h"
@@ -1254,4 +1254,4 @@ protected:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_BluetoothInterface_h
diff --git a/dom/bluetooth/BluetoothProfileManagerBase.h b/dom/bluetooth/BluetoothProfileManagerBase.h
index e3bc39e8aaf..c90a51ee195 100644
--- a/dom/bluetooth/BluetoothProfileManagerBase.h
+++ b/dom/bluetooth/BluetoothProfileManagerBase.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothprofilemanagerbase_h__
-#define mozilla_dom_bluetooth_bluetoothprofilemanagerbase_h__
+#ifndef mozilla_dom_bluetooth_BluetoothProfileManagerBase_h
+#define mozilla_dom_bluetooth_BluetoothProfileManagerBase_h
 
 /**
  * Error Messages used in Bluetooth profiles
@@ -108,4 +108,4 @@ public:                                                                      \
 
 END_BLUETOOTH_NAMESPACE
 
-#endif  //#ifndef mozilla_dom_bluetooth_bluetoothprofilemanagerbase_h__
+#endif  // mozilla_dom_bluetooth_BluetoothProfileManagerBase_h
diff --git a/dom/bluetooth/BluetoothRilListener.h b/dom/bluetooth/BluetoothRilListener.h
index 55f4e6f35bb..cb0e27cb7e6 100644
--- a/dom/bluetooth/BluetoothRilListener.h
+++ b/dom/bluetooth/BluetoothRilListener.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothrillistener_h__
-#define mozilla_dom_bluetooth_bluetoothrillistener_h__
+#ifndef mozilla_dom_bluetooth_BluetoothRilListener_h
+#define mozilla_dom_bluetooth_BluetoothRilListener_h
 
 #include "BluetoothCommon.h"
 
@@ -137,4 +137,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_BluetoothRilListener_h
diff --git a/dom/bluetooth/BluetoothSocketObserver.h b/dom/bluetooth/BluetoothSocketObserver.h
index dbea171cc27..e4eacbb0366 100644
--- a/dom/bluetooth/BluetoothSocketObserver.h
+++ b/dom/bluetooth/BluetoothSocketObserver.h
@@ -52,4 +52,4 @@ public:                                                                     \
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_BluetoothSocketObserver_h
diff --git a/dom/bluetooth/BluetoothUtils.h b/dom/bluetooth/BluetoothUtils.h
index 4f086682646..0414bd6ba1c 100644
--- a/dom/bluetooth/BluetoothUtils.h
+++ b/dom/bluetooth/BluetoothUtils.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothutils_h
-#define mozilla_dom_bluetooth_bluetoothutils_h
+#ifndef mozilla_dom_bluetooth_BluetoothUtils_h
+#define mozilla_dom_bluetooth_BluetoothUtils_h
 
 #include "BluetoothCommon.h"
 #include "js/TypeDecls.h"
@@ -159,4 +159,4 @@ DispatchStatusChangedEvent(const nsAString& aType,
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_BluetoothUtils_h
diff --git a/dom/bluetooth/BluetoothUuid.h b/dom/bluetooth/BluetoothUuid.h
index 56d53d7744f..465d2cb838f 100644
--- a/dom/bluetooth/BluetoothUuid.h
+++ b/dom/bluetooth/BluetoothUuid.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothuuid_h__
-#define mozilla_dom_bluetooth_bluetoothuuid_h__
+#ifndef mozilla_dom_bluetooth_BluetoothUuid_h
+#define mozilla_dom_bluetooth_BluetoothUuid_h
 
 #include "BluetoothCommon.h"
 
@@ -82,4 +82,4 @@ enum BluetoothReservedChannels {
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_BluetoothUuid_h
diff --git a/dom/bluetooth/ObexBase.h b/dom/bluetooth/ObexBase.h
index 5a650294eed..53fbd19fb9f 100644
--- a/dom/bluetooth/ObexBase.h
+++ b/dom/bluetooth/ObexBase.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_obexbase_h__
-#define mozilla_dom_bluetooth_obexbase_h__
+#ifndef mozilla_dom_bluetooth_ObexBase_h
+#define mozilla_dom_bluetooth_ObexBase_h
 
 #include "BluetoothCommon.h"
 #include "nsAutoPtr.h"
@@ -337,4 +337,4 @@ bool ParseHeaders(const uint8_t* aHeaderStart,
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_ObexBase_h
diff --git a/dom/bluetooth/bluedroid/BluetoothA2dpManager.h b/dom/bluetooth/bluedroid/BluetoothA2dpManager.h
index c7b40a669e6..0a2475f50ab 100644
--- a/dom/bluetooth/bluedroid/BluetoothA2dpManager.h
+++ b/dom/bluetooth/bluedroid/BluetoothA2dpManager.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetootha2dpmanager_h__
-#define mozilla_dom_bluetooth_bluetootha2dpmanager_h__
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothA2dpManager_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothA2dpManager_h
 
 #include "BluetoothCommon.h"
 #include "BluetoothInterface.h"
diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.h b/dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.h
index 2c42981a277..c68a337a493 100644
--- a/dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.h
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothdaemona2dpinterface_h
-#define mozilla_dom_bluetooth_bluetoothdaemona2dpinterface_h
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothDaemonA2dpInterface_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonA2dpInterface_h
 
 #include "BluetoothDaemonHelpers.h"
 #include "BluetoothInterface.h"
@@ -162,4 +162,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluedroid_BluetoothDaemonA2dpInterface_h
diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.h b/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.h
index c906503256e..7ec2764d997 100644
--- a/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.h
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothdaemonavrcpinterface_h
-#define mozilla_dom_bluetooth_bluetoothdaemonavrcpinterface_h
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothDaemonAvrcpInterface_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonAvrcpInterface_h
 
 #include "BluetoothDaemonHelpers.h"
 #include "BluetoothInterface.h"
@@ -361,4 +361,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluedroid_BluetoothDaemonAvrcpInterface_h
diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.h b/dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.h
index 0998032e13c..d5aaa4028b5 100644
--- a/dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.h
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothdaemongattinterface_h
-#define mozilla_dom_bluetooth_bluetoothdaemongattinterface_h
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothDaemonGattInterface_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonGattInterface_h
 
 #include "BluetoothDaemonHelpers.h"
 #include "BluetoothInterface.h"
@@ -1035,4 +1035,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluedroid_BluetoothDaemonGattInterface_h
diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h b/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h
index 9c62314db16..02329f71015 100644
--- a/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothdaemonhandsfreeinterface_h
-#define mozilla_dom_bluetooth_bluetoothdaemonhandsfreeinterface_h
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothDaemonHandsfreeInterface_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonHandsfreeInterface_h
 
 #include "BluetoothDaemonHelpers.h"
 #include "BluetoothInterface.h"
@@ -471,4 +471,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluedroid_BluetoothDaemonHandsfreeInterface_h
diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h b/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h
index 32de4709bf7..6baa2334d73 100644
--- a/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluedroid_bluetoothdaemonhelpers_h__
-#define mozilla_dom_bluetooth_bluedroid_bluetoothdaemonhelpers_h__
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothDaemonHelpers_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonHelpers_h
 
 #include "BluetoothCommon.h"
 #include "mozilla/ArrayUtils.h"
@@ -1191,4 +1191,4 @@ public:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluedroid_BluetoothDaemonHelpers_h
diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonInterface.h b/dom/bluetooth/bluedroid/BluetoothDaemonInterface.h
index d69097c6cca..e3ddabe6059 100644
--- a/dom/bluetooth/bluedroid/BluetoothDaemonInterface.h
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonInterface.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluedroid_bluetoothdaemoninterface_h__
-#define mozilla_dom_bluetooth_bluedroid_bluetoothdaemoninterface_h__
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothDaemonInterface_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonInterface_h
 
 #include "BluetoothInterface.h"
 #include "mozilla/ipc/DaemonSocketConsumer.h"
@@ -167,4 +167,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluedroid_BluetoothDaemonInterface_h
diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonSetupInterface.h b/dom/bluetooth/bluedroid/BluetoothDaemonSetupInterface.h
index 58c365e4f90..b0b637f8077 100644
--- a/dom/bluetooth/bluedroid/BluetoothDaemonSetupInterface.h
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonSetupInterface.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluedroid_bluetoothdaemonsetupinterface_h__
-#define mozilla_dom_bluetooth_bluedroid_bluetoothdaemonsetupinterface_h__
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothDaemonSetupInterface_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonSetupInterface_h
 
 #include "BluetoothCommon.h"
 
@@ -27,4 +27,4 @@ protected:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluedroid_BluetoothDaemonSetupInterface_h
diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.h b/dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.h
index 144c2c0beed..a5e20ec207d 100644
--- a/dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.h
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluedroid_bluetoothdaemonsocketinterface_h__
-#define mozilla_dom_bluetooth_bluedroid_bluetoothdaemonsocketinterface_h__
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothDaemonSocketInterface_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonSocketInterface_h
 
 #include "BluetoothDaemonHelpers.h"
 #include "BluetoothInterface.h"
@@ -122,4 +122,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluedroid_BluetoothDaemonSocketInterface_h
diff --git a/dom/bluetooth/bluedroid/BluetoothGattManager.h b/dom/bluetooth/bluedroid/BluetoothGattManager.h
index c681cb5e7b2..455c36858fc 100644
--- a/dom/bluetooth/bluedroid/BluetoothGattManager.h
+++ b/dom/bluetooth/bluedroid/BluetoothGattManager.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothgattmanager_h__
-#define mozilla_dom_bluetooth_bluetoothgattmanager_h__
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothGattManager_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothGattManager_h
 
 #include "BluetoothCommon.h"
 #include "BluetoothInterface.h"
@@ -205,4 +205,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluedroid_BluetoothGattManager_h
diff --git a/dom/bluetooth/bluedroid/BluetoothOppManager.h b/dom/bluetooth/bluedroid/BluetoothOppManager.h
index 0b9cd41555b..327ad5042c2 100644
--- a/dom/bluetooth/bluedroid/BluetoothOppManager.h
+++ b/dom/bluetooth/bluedroid/BluetoothOppManager.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothoppmanager_h__
-#define mozilla_dom_bluetooth_bluetoothoppmanager_h__
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothOppManager_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothOppManager_h
 
 #include "BluetoothCommon.h"
 #include "BluetoothProfileManagerBase.h"
@@ -219,4 +219,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluedroid_BluetoothOppManager_h
diff --git a/dom/bluetooth/bluedroid/BluetoothPbapManager.h b/dom/bluetooth/bluedroid/BluetoothPbapManager.h
index 62253c8f566..1351e2bd919 100644
--- a/dom/bluetooth/bluedroid/BluetoothPbapManager.h
+++ b/dom/bluetooth/bluedroid/BluetoothPbapManager.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothpbapmanager_h__
-#define mozilla_dom_bluetooth_bluetoothpbapmanager_h__
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothPbapManager_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothPbapManager_h
 
 #include "BluetoothCommon.h"
 #include "BluetoothProfileManagerBase.h"
@@ -99,4 +99,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluedroid_BluetoothPbapManager_h
diff --git a/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.h b/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.h
index c5cb5199905..dfef5466efc 100644
--- a/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.h
+++ b/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothservicebluedroid_h__
-#define mozilla_dom_bluetooth_bluetoothservicebluedroid_h__
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothServiceBluedroid_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothServiceBluedroid_h
 
 #include "BluetoothCommon.h"
 #include "BluetoothInterface.h"
@@ -395,4 +395,4 @@ protected:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluedroid_BluetoothServiceBluedroid_h
diff --git a/dom/bluetooth/bluedroid/BluetoothSocket.h b/dom/bluetooth/bluedroid/BluetoothSocket.h
index a89f32dbe33..423bc81ad42 100644
--- a/dom/bluetooth/bluedroid/BluetoothSocket.h
+++ b/dom/bluetooth/bluedroid/BluetoothSocket.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_BluetoothSocket_h
-#define mozilla_dom_bluetooth_BluetoothSocket_h
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothSocket_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothSocket_h
 
 #include "BluetoothCommon.h"
 #include "mozilla/ipc/DataSocket.h"
@@ -98,4 +98,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluedroid_BluetoothSocket_h
diff --git a/dom/bluetooth/bluedroid/BluetoothSocketMessageWatcher.h b/dom/bluetooth/bluedroid/BluetoothSocketMessageWatcher.h
index 880020f679b..30b75c98eaa 100644
--- a/dom/bluetooth/bluedroid/BluetoothSocketMessageWatcher.h
+++ b/dom/bluetooth/bluedroid/BluetoothSocketMessageWatcher.h
@@ -4,6 +4,9 @@
  * 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/. */
 
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothSocketMessageWatcher_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothSocketMessageWatcher_h
+
 #include "base/message_loop.h"
 #include "BluetoothCommon.h"
 
@@ -107,3 +110,5 @@ private:
 };
 
 END_BLUETOOTH_NAMESPACE
+
+#endif // mozilla_dom_bluetooth_bluedroid_BluetoothSocketMessageWatcher_h
diff --git a/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.h b/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.h
index c99ffa0967a..b7093936ea9 100644
--- a/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.h
+++ b/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothhfpmanager_h__
-#define mozilla_dom_bluetooth_bluetoothhfpmanager_h__
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothHfpManager_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothHfpManager_h
 
 #include "BluetoothHfpManagerBase.h"
 
@@ -48,4 +48,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluedroid_BluetoothHfpManager_h
diff --git a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h
index cc2c8572e6c..99c4881db8a 100644
--- a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h
+++ b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothhfpmanager_h__
-#define mozilla_dom_bluetooth_bluetoothhfpmanager_h__
+#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothHfpManager_h
+#define mozilla_dom_bluetooth_bluedroid_BluetoothHfpManager_h
 
 #include "BluetoothInterface.h"
 #include "BluetoothCommon.h"
@@ -228,4 +228,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluedroid_BluetoothHfpManager_h
diff --git a/dom/bluetooth/bluetooth2/BluetoothAdapter.h b/dom/bluetooth/bluetooth2/BluetoothAdapter.h
index 962dc8e56bb..fd9ce0500e4 100644
--- a/dom/bluetooth/bluetooth2/BluetoothAdapter.h
+++ b/dom/bluetooth/bluetooth2/BluetoothAdapter.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothadapter_h__
-#define mozilla_dom_bluetooth_bluetoothadapter_h__
+#ifndef mozilla_dom_bluetooth_BluetoothAdapter_h
+#define mozilla_dom_bluetooth_BluetoothAdapter_h
 
 #include "BluetoothCommon.h"
 #include "mozilla/Attributes.h"
@@ -417,4 +417,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_BluetoothAdapter_h
diff --git a/dom/bluetooth/bluetooth2/BluetoothClassOfDevice.h b/dom/bluetooth/bluetooth2/BluetoothClassOfDevice.h
index ab92edee6e4..947c8dc6fc0 100644
--- a/dom/bluetooth/bluetooth2/BluetoothClassOfDevice.h
+++ b/dom/bluetooth/bluetooth2/BluetoothClassOfDevice.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothclassofdevice_h
-#define mozilla_dom_bluetooth_bluetoothclassofdevice_h
+#ifndef mozilla_dom_bluetooth_BluetoothClassOfDevice_h
+#define mozilla_dom_bluetooth_BluetoothClassOfDevice_h
 
 #include "BluetoothCommon.h"
 #include "mozilla/Attributes.h"
@@ -90,4 +90,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif // mozilla_dom_bluetooth_bluetoothclassofdevice_h
+#endif // mozilla_dom_bluetooth_BluetoothClassOfDevice_h
diff --git a/dom/bluetooth/bluetooth2/BluetoothDevice.h b/dom/bluetooth/bluetooth2/BluetoothDevice.h
index 0fc2021d7ca..8be5c67284a 100644
--- a/dom/bluetooth/bluetooth2/BluetoothDevice.h
+++ b/dom/bluetooth/bluetooth2/BluetoothDevice.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothdevice_h__
-#define mozilla_dom_bluetooth_bluetoothdevice_h__
+#ifndef mozilla_dom_bluetooth_BluetoothDevice_h
+#define mozilla_dom_bluetooth_BluetoothDevice_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/DOMEventTargetHelper.h"
@@ -244,4 +244,4 @@ public:
   }
 };
 
-#endif
+#endif // mozilla_dom_bluetooth_BluetoothDevice_h
diff --git a/dom/bluetooth/bluetooth2/BluetoothDiscoveryHandle.h b/dom/bluetooth/bluetooth2/BluetoothDiscoveryHandle.h
index a2ca2e055e9..8bae6301060 100644
--- a/dom/bluetooth/bluetooth2/BluetoothDiscoveryHandle.h
+++ b/dom/bluetooth/bluetooth2/BluetoothDiscoveryHandle.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothdiscoveryhandle_h
-#define mozilla_dom_bluetooth_bluetoothdiscoveryhandle_h
+#ifndef mozilla_dom_bluetooth_BluetoothDiscoveryHandle_h
+#define mozilla_dom_bluetooth_BluetoothDiscoveryHandle_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/DOMEventTargetHelper.h"
@@ -76,4 +76,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif // mozilla_dom_bluetooth_bluetoothdiscoveryhandle_h
+#endif // mozilla_dom_bluetooth_BluetoothDiscoveryHandle_h
diff --git a/dom/bluetooth/bluetooth2/BluetoothGatt.h b/dom/bluetooth/bluetooth2/BluetoothGatt.h
index 2f494f2a3ac..0085df06e73 100644
--- a/dom/bluetooth/bluetooth2/BluetoothGatt.h
+++ b/dom/bluetooth/bluetooth2/BluetoothGatt.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothgatt_h__
-#define mozilla_dom_bluetooth_bluetoothgatt_h__
+#ifndef mozilla_dom_bluetooth_BluetoothGatt_h
+#define mozilla_dom_bluetooth_BluetoothGatt_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/DOMEventTargetHelper.h"
@@ -191,4 +191,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_BluetoothGatt_h
diff --git a/dom/bluetooth/bluetooth2/BluetoothGattCharacteristic.h b/dom/bluetooth/bluetooth2/BluetoothGattCharacteristic.h
index 61682aea10e..ff6eff40044 100644
--- a/dom/bluetooth/bluetooth2/BluetoothGattCharacteristic.h
+++ b/dom/bluetooth/bluetooth2/BluetoothGattCharacteristic.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothgattcharacteristic_h__
-#define mozilla_dom_bluetooth_bluetoothgattcharacteristic_h__
+#ifndef mozilla_dom_bluetooth_BluetoothGattCharacteristic_h
+#define mozilla_dom_bluetooth_BluetoothGattCharacteristic_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/BluetoothGattCharacteristicBinding.h"
@@ -185,4 +185,4 @@ public:
   }
 };
 
-#endif
+#endif // mozilla_dom_bluetooth_BluetoothGattCharacteristic_h
diff --git a/dom/bluetooth/bluetooth2/BluetoothGattDescriptor.h b/dom/bluetooth/bluetooth2/BluetoothGattDescriptor.h
index 9f37b078370..2f74ae04b14 100644
--- a/dom/bluetooth/bluetooth2/BluetoothGattDescriptor.h
+++ b/dom/bluetooth/bluetooth2/BluetoothGattDescriptor.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothgattdescriptor_h__
-#define mozilla_dom_bluetooth_bluetoothgattdescriptor_h__
+#ifndef mozilla_dom_bluetooth_BluetoothGattDescriptor_h
+#define mozilla_dom_bluetooth_BluetoothGattDescriptor_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/BluetoothGattDescriptorBinding.h"
@@ -108,4 +108,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_BluetoothGattDescriptor_h
diff --git a/dom/bluetooth/bluetooth2/BluetoothGattServer.h b/dom/bluetooth/bluetooth2/BluetoothGattServer.h
index ee2d48eb4c6..2865c9167cd 100644
--- a/dom/bluetooth/bluetooth2/BluetoothGattServer.h
+++ b/dom/bluetooth/bluetooth2/BluetoothGattServer.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothgattserver_h__
-#define mozilla_dom_bluetooth_bluetoothgattserver_h__
+#ifndef mozilla_dom_bluetooth_BluetoothGattServer_h
+#define mozilla_dom_bluetooth_BluetoothGattServer_h
 
 #include "mozilla/dom/BluetoothGattServerBinding.h"
 #include "mozilla/dom/bluetooth/BluetoothCommon.h"
@@ -66,4 +66,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_BluetoothGattServer_h
diff --git a/dom/bluetooth/bluetooth2/BluetoothGattService.h b/dom/bluetooth/bluetooth2/BluetoothGattService.h
index 2199ff63b3d..7b8fbbe6178 100644
--- a/dom/bluetooth/bluetooth2/BluetoothGattService.h
+++ b/dom/bluetooth/bluetooth2/BluetoothGattService.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothgattservice_h__
-#define mozilla_dom_bluetooth_bluetoothgattservice_h__
+#ifndef mozilla_dom_bluetooth_BluetoothGattService_h
+#define mozilla_dom_bluetooth_BluetoothGattService_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/BluetoothGattServiceBinding.h"
@@ -179,4 +179,4 @@ public:
   }
 };
 
-#endif
+#endif // mozilla_dom_bluetooth_BluetoothGattService_h
diff --git a/dom/bluetooth/bluetooth2/BluetoothLeDeviceEvent.h b/dom/bluetooth/bluetooth2/BluetoothLeDeviceEvent.h
index 28362c37be1..a2e4af13c17 100644
--- a/dom/bluetooth/bluetooth2/BluetoothLeDeviceEvent.h
+++ b/dom/bluetooth/bluetooth2/BluetoothLeDeviceEvent.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothledeviceevent_h
-#define mozilla_dom_bluetooth_bluetoothledeviceevent_h
+#ifndef mozilla_dom_bluetooth_BluetoothLeDeviceEvent_h
+#define mozilla_dom_bluetooth_BluetoothLeDeviceEvent_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/ErrorResult.h"
@@ -61,4 +61,4 @@ public:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif // mozilla_dom_bluetooth_bluetoothledeviceevent_h
+#endif // mozilla_dom_bluetooth_BluetoothLeDeviceEvent_h
diff --git a/dom/bluetooth/bluetooth2/BluetoothManager.h b/dom/bluetooth/bluetooth2/BluetoothManager.h
index aba4df78e1b..4f33b4f34f4 100644
--- a/dom/bluetooth/bluetooth2/BluetoothManager.h
+++ b/dom/bluetooth/bluetooth2/BluetoothManager.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothmanager_h__
-#define mozilla_dom_bluetooth_bluetoothmanager_h__
+#ifndef mozilla_dom_bluetooth_BluetoothManager_h
+#define mozilla_dom_bluetooth_BluetoothManager_h
 
 #include "BluetoothCommon.h"
 #include "mozilla/Attributes.h"
@@ -140,4 +140,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_BluetoothManager_h
diff --git a/dom/bluetooth/bluetooth2/BluetoothPairingHandle.h b/dom/bluetooth/bluetooth2/BluetoothPairingHandle.h
index b85e5772a21..9669f9d9991 100644
--- a/dom/bluetooth/bluetooth2/BluetoothPairingHandle.h
+++ b/dom/bluetooth/bluetooth2/BluetoothPairingHandle.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothpairinghandle_h
-#define mozilla_dom_bluetooth_bluetoothpairinghandle_h
+#ifndef mozilla_dom_bluetooth_BluetoothPairingHandle_h
+#define mozilla_dom_bluetooth_BluetoothPairingHandle_h
 
 #include "BluetoothCommon.h"
 #include "nsWrapperCache.h"
@@ -79,4 +79,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif // mozilla_dom_bluetooth_bluetoothpairinghandle_h
+#endif // mozilla_dom_bluetooth_BluetoothPairingHandle_h
diff --git a/dom/bluetooth/bluetooth2/BluetoothPairingListener.h b/dom/bluetooth/bluetooth2/BluetoothPairingListener.h
index 0dd5ea653fc..195c931b4ea 100644
--- a/dom/bluetooth/bluetooth2/BluetoothPairingListener.h
+++ b/dom/bluetooth/bluetooth2/BluetoothPairingListener.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothpairinglistener_h
-#define mozilla_dom_bluetooth_bluetoothpairinglistener_h
+#ifndef mozilla_dom_bluetooth_BluetoothPairingListener_h
+#define mozilla_dom_bluetooth_BluetoothPairingListener_h
 
 #include "BluetoothCommon.h"
 #include "mozilla/Attributes.h"
@@ -68,4 +68,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif // mozilla_dom_bluetooth_bluetoothpairinglistener_h
+#endif // mozilla_dom_bluetooth_BluetoothPairingListener_h
diff --git a/dom/bluetooth/bluetooth2/BluetoothProfileController.h b/dom/bluetooth/bluetooth2/BluetoothProfileController.h
index da71a3d49d7..01831306814 100644
--- a/dom/bluetooth/bluetooth2/BluetoothProfileController.h
+++ b/dom/bluetooth/bluetooth2/BluetoothProfileController.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothprofilecontroller_h__
-#define mozilla_dom_bluetooth_bluetoothprofilecontroller_h__
+#ifndef mozilla_dom_bluetooth_BluetoothProfileController_h
+#define mozilla_dom_bluetooth_BluetoothProfileController_h
 
 #include "BluetoothUuid.h"
 #include "nsISupportsImpl.h"
@@ -157,4 +157,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_BluetoothProfileController_h
diff --git a/dom/bluetooth/bluetooth2/BluetoothReplyRunnable.h b/dom/bluetooth/bluetooth2/BluetoothReplyRunnable.h
index 4ef5ddce3b7..92599a1e756 100644
--- a/dom/bluetooth/bluetooth2/BluetoothReplyRunnable.h
+++ b/dom/bluetooth/bluetooth2/BluetoothReplyRunnable.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothreplyrunnable_h__
-#define mozilla_dom_bluetooth_bluetoothreplyrunnable_h__
+#ifndef mozilla_dom_bluetooth_BluetoothReplyRunnable_h
+#define mozilla_dom_bluetooth_BluetoothReplyRunnable_h
 
 #include "mozilla/Attributes.h"
 #include "BluetoothCommon.h"
@@ -90,4 +90,4 @@ protected:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_BluetoothReplyRunnable_h
diff --git a/dom/bluetooth/bluetooth2/BluetoothService.h b/dom/bluetooth/bluetooth2/BluetoothService.h
index d362a79cc35..54e865dcd0e 100644
--- a/dom/bluetooth/bluetooth2/BluetoothService.h
+++ b/dom/bluetooth/bluetooth2/BluetoothService.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetootheventservice_h__
-#define mozilla_dom_bluetooth_bluetootheventservice_h__
+#ifndef mozilla_dom_bluetooth_BluetoothService_h
+#define mozilla_dom_bluetooth_BluetoothService_h
 
 #include "BluetoothCommon.h"
 #include "BluetoothInterface.h"
@@ -564,4 +564,4 @@ protected:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_BluetoothService_h
diff --git a/dom/bluetooth/bluetooth2/ipc/BluetoothChild.h b/dom/bluetooth/bluetooth2/ipc/BluetoothChild.h
index 341616f28c0..23304168926 100644
--- a/dom/bluetooth/bluetooth2/ipc/BluetoothChild.h
+++ b/dom/bluetooth/bluetooth2/ipc/BluetoothChild.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_ipc_bluetoothchild_h__
-#define mozilla_dom_bluetooth_ipc_bluetoothchild_h__
+#ifndef mozilla_dom_bluetooth_ipc_BluetoothChild_h
+#define mozilla_dom_bluetooth_ipc_BluetoothChild_h
 
 #include "mozilla/dom/bluetooth/BluetoothCommon.h"
 
@@ -102,4 +102,4 @@ protected:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif // mozilla_dom_bluetooth_ipc_bluetoothchild_h__
+#endif // mozilla_dom_bluetooth_ipc_BluetoothChild_h
diff --git a/dom/bluetooth/bluetooth2/ipc/BluetoothMessageUtils.h b/dom/bluetooth/bluetooth2/ipc/BluetoothMessageUtils.h
index 00afe380f53..35b564c7453 100644
--- a/dom/bluetooth/bluetooth2/ipc/BluetoothMessageUtils.h
+++ b/dom/bluetooth/bluetooth2/ipc/BluetoothMessageUtils.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_ipc_bluetoothmessageutils_h__
-#define mozilla_dom_bluetooth_ipc_bluetoothmessageutils_h__
+#ifndef mozilla_dom_bluetooth_ipc_BluetoothMessageUtils_h
+#define mozilla_dom_bluetooth_ipc_BluetoothMessageUtils_h
 
 #include "mozilla/dom/bluetooth/BluetoothCommon.h"
 #include "ipc/IPCMessageUtils.h"
@@ -138,4 +138,4 @@ struct ParamTraits<mozilla::dom::bluetooth::BluetoothGattCharAttribute>
 
 } // namespace IPC
 
-#endif // mozilla_dom_bluetooth_ipc_bluetoothmessageutils_h__
+#endif // mozilla_dom_bluetooth_ipc_BluetoothMessageUtils_h
diff --git a/dom/bluetooth/bluetooth2/ipc/BluetoothParent.h b/dom/bluetooth/bluetooth2/ipc/BluetoothParent.h
index 47dcc3c1d5f..ca2fdc7b9b1 100644
--- a/dom/bluetooth/bluetooth2/ipc/BluetoothParent.h
+++ b/dom/bluetooth/bluetooth2/ipc/BluetoothParent.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_ipc_bluetoothparent_h__
-#define mozilla_dom_bluetooth_ipc_bluetoothparent_h__
+#ifndef mozilla_dom_bluetooth_ipc_BluetoothParent_h
+#define mozilla_dom_bluetooth_ipc_BluetoothParent_h
 
 #include "mozilla/dom/bluetooth/BluetoothCommon.h"
 
@@ -265,4 +265,4 @@ protected:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif // mozilla_dom_bluetooth_ipc_bluetoothparent_h__
+#endif // mozilla_dom_bluetooth_ipc_BluetoothParent_h
diff --git a/dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.h b/dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.h
index aebf930de77..0987994161e 100644
--- a/dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.h
+++ b/dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_ipc_bluetoothservicechildprocess_h__
-#define mozilla_dom_bluetooth_ipc_bluetoothservicechildprocess_h__
+#ifndef mozilla_dom_bluetooth_ipc_BluetoothServiceChildProcess_h
+#define mozilla_dom_bluetooth_ipc_BluetoothServiceChildProcess_h
 
 #include "BluetoothService.h"
 
@@ -295,4 +295,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif // mozilla_dom_bluetooth_ipc_bluetoothservicechildprocess_h__
+#endif // mozilla_dom_bluetooth_ipc_BluetoothServiceChildProcess_h
diff --git a/dom/bluetooth/bluez/BluetoothA2dpManager.h b/dom/bluetooth/bluez/BluetoothA2dpManager.h
index ee6eee82ddc..d49a697333f 100644
--- a/dom/bluetooth/bluez/BluetoothA2dpManager.h
+++ b/dom/bluetooth/bluez/BluetoothA2dpManager.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetootha2dpmanager_h__
-#define mozilla_dom_bluetooth_bluetootha2dpmanager_h__
+#ifndef mozilla_dom_bluetooth_bluez_BluetoothA2dpManager_h
+#define mozilla_dom_bluetooth_bluez_BluetoothA2dpManager_h
 
 #include "BluetoothCommon.h"
 #include "BluetoothProfileController.h"
@@ -87,4 +87,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluez_BluetoothA2dpManager_h
diff --git a/dom/bluetooth/bluez/BluetoothDBusService.h b/dom/bluetooth/bluez/BluetoothDBusService.h
index d11d14a1987..ae1c9e9213e 100644
--- a/dom/bluetooth/bluez/BluetoothDBusService.h
+++ b/dom/bluetooth/bluez/BluetoothDBusService.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothdbusservice_h__
-#define mozilla_dom_bluetooth_bluetoothdbusservice_h__
+#ifndef mozilla_dom_bluetooth_bluez_BluetoothDBusService_h
+#define mozilla_dom_bluetooth_bluez_BluetoothDBusService_h
 
 #include "mozilla/Attributes.h"
 #include "BluetoothCommon.h"
@@ -338,4 +338,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluez_BluetoothDBusService_h
diff --git a/dom/bluetooth/bluez/BluetoothHfpManager.h b/dom/bluetooth/bluez/BluetoothHfpManager.h
index 2b160f549c0..0dec57287ff 100644
--- a/dom/bluetooth/bluez/BluetoothHfpManager.h
+++ b/dom/bluetooth/bluez/BluetoothHfpManager.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothhfpmanager_h__
-#define mozilla_dom_bluetooth_bluetoothhfpmanager_h__
+#ifndef mozilla_dom_bluetooth_bluez_BluetoothHfpManager_h
+#define mozilla_dom_bluetooth_bluez_BluetoothHfpManager_h
 
 #include "BluetoothCommon.h"
 #include "BluetoothHfpManagerBase.h"
@@ -230,4 +230,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluez_BluetoothHfpManager_h
diff --git a/dom/bluetooth/bluez/BluetoothOppManager.h b/dom/bluetooth/bluez/BluetoothOppManager.h
index e5bb26b56a8..95f2af411dd 100644
--- a/dom/bluetooth/bluez/BluetoothOppManager.h
+++ b/dom/bluetooth/bluez/BluetoothOppManager.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_bluetoothoppmanager_h__
-#define mozilla_dom_bluetooth_bluetoothoppmanager_h__
+#ifndef mozilla_dom_bluetooth_bluez_BluetoothOppManager_h
+#define mozilla_dom_bluetooth_bluez_BluetoothOppManager_h
 
 #include "BluetoothCommon.h"
 #include "BluetoothProfileManagerBase.h"
@@ -228,4 +228,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluez_BluetoothOppManager_h
diff --git a/dom/bluetooth/bluez/BluetoothSocket.h b/dom/bluetooth/bluez/BluetoothSocket.h
index 0ab6c9e4c7d..409cc1432ff 100644
--- a/dom/bluetooth/bluez/BluetoothSocket.h
+++ b/dom/bluetooth/bluez/BluetoothSocket.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_BluetoothSocket_h
-#define mozilla_dom_bluetooth_BluetoothSocket_h
+#ifndef mozilla_dom_bluetooth_bluez_BluetoothSocket_h
+#define mozilla_dom_bluetooth_bluez_BluetoothSocket_h
 
 #include "BluetoothCommon.h"
 #include "mozilla/ipc/DataSocket.h"
@@ -135,4 +135,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluez_BluetoothSocket_h
diff --git a/dom/bluetooth/bluez/BluetoothUnixSocketConnector.h b/dom/bluetooth/bluez/BluetoothUnixSocketConnector.h
index 75f4371c601..af99b87d9b8 100644
--- a/dom/bluetooth/bluez/BluetoothUnixSocketConnector.h
+++ b/dom/bluetooth/bluez/BluetoothUnixSocketConnector.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_dom_bluetooth_BluetoothUnixSocketConnector_h
-#define mozilla_dom_bluetooth_BluetoothUnixSocketConnector_h
+#ifndef mozilla_dom_bluetooth_bluez_BluetoothUnixSocketConnector_h
+#define mozilla_dom_bluetooth_bluez_BluetoothUnixSocketConnector_h
 
 #include <bluetooth/bluetooth.h>
 #include "BluetoothCommon.h"
@@ -61,4 +61,4 @@ private:
 
 END_BLUETOOTH_NAMESPACE
 
-#endif
+#endif // mozilla_dom_bluetooth_bluez_BluetoothUnixSocketConnector_h

From 63711789ff3892cf3368ce3bcbd725a6495dc8ff Mon Sep 17 00:00:00 2001
From: Liang-Heng Chen <xeonchen@mozilla.com>
Date: Tue, 4 Aug 2015 20:01:00 +0200
Subject: [PATCH 07/56] Bug 1175387 - close file descriptor after detached from
 STS. r=mcmanus

---
 .../mdns/libmdns/MDNSResponderOperator.cpp    | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/netwerk/dns/mdns/libmdns/MDNSResponderOperator.cpp b/netwerk/dns/mdns/libmdns/MDNSResponderOperator.cpp
index f3afb41b879..87e28653445 100644
--- a/netwerk/dns/mdns/libmdns/MDNSResponderOperator.cpp
+++ b/netwerk/dns/mdns/libmdns/MDNSResponderOperator.cpp
@@ -65,14 +65,21 @@ public:
   virtual void OnSocketDetached(PRFileDesc *fd) override
   {
     MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
+    MOZ_ASSERT(mThread);
     MOZ_ASSERT(fd == mFD);
 
     if (!mFD) {
       return;
     }
 
+    // Bug 1175387: do not double close the handle here.
+    PR_ChangeFileDescNativeHandle(mFD, -1);
     PR_Close(mFD);
     mFD = nullptr;
+
+    nsCOMPtr<nsIRunnable> ev =
+      NS_NewRunnableMethod(this, &ServiceWatcher::Deallocate);
+    mThread->Dispatch(ev, NS_DISPATCH_NORMAL);
   }
 
   virtual void IsLocal(bool *aIsLocal) override { *aIsLocal = true; }
@@ -86,7 +93,8 @@ public:
   virtual uint64_t ByteCountReceived() override { return 0; }
 
   explicit ServiceWatcher(DNSServiceRef aService)
-    : mSts(nullptr)
+    : mThread(nullptr)
+    , mSts(nullptr)
     , mService(aService)
     , mFD(nullptr)
     , mAttached(false)
@@ -101,6 +109,7 @@ public:
   nsresult Init()
   {
     MOZ_ASSERT(PR_GetCurrentThread() != gSocketThread);
+    mThread = NS_GetCurrentThread();
 
     if (!mService) {
       return NS_OK;
@@ -124,12 +133,8 @@ public:
   {
     MOZ_ASSERT(PR_GetCurrentThread() != gSocketThread);
 
-    if (mService) {
-      DNSServiceRefDeallocate(mService);
-      mService = nullptr;
-    }
-
     if (!gSocketTransportService) {
+      Deallocate();
       return;
     }
 
@@ -139,6 +144,14 @@ public:
 private:
   ~ServiceWatcher() = default;
 
+  void Deallocate()
+  {
+    if (mService) {
+      DNSServiceRefDeallocate(mService);
+      mService = nullptr;
+    }
+  }
+
   nsresult PostEvent(void(ServiceWatcher::*func)(void))
   {
     nsCOMPtr<nsIRunnable> ev = NS_NewRunnableMethod(this, func);
@@ -232,6 +245,7 @@ private:
     return NS_OK;
   }
 
+  nsCOMPtr<nsIThread> mThread;
   nsRefPtr<nsSocketTransportService> mSts;
   DNSServiceRef mService;
   PRFileDesc* mFD;

From 711a43c8f8015ddca36b6001f210407430a3876b Mon Sep 17 00:00:00 2001
From: Boris Chiou <boris.chiou@gmail.com>
Date: Mon, 3 Aug 2015 19:43:00 +0200
Subject: [PATCH 08/56] Bug 1180657 - Use hwc directly on GonkDisplayICS.
 r=sotaro

---
 widget/gonk/HwcComposer2D.cpp             | 9 +--------
 widget/gonk/libdisplay/GonkDisplayICS.cpp | 9 ++++++++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/widget/gonk/HwcComposer2D.cpp b/widget/gonk/HwcComposer2D.cpp
index 4ae74be8b51..afd0c4f4bc1 100644
--- a/widget/gonk/HwcComposer2D.cpp
+++ b/widget/gonk/HwcComposer2D.cpp
@@ -840,14 +840,7 @@ bool
 HwcComposer2D::Render(nsIWidget* aWidget)
 {
     nsScreenGonk* screen = static_cast<nsWindow*>(aWidget)->GetScreen();
-    GetGonkDisplay()->SwapBuffers(screen->GetEGLDisplay(), screen->GetEGLSurface());
-
-    if (!mHal->HasHwc()) {
-        return true;
-    }
-
-    mHal->Prepare(nullptr, screen->GetDisplayType(), nullptr, -1);
-    return !mHal->Set(nullptr, screen->GetDisplayType());
+    return GetGonkDisplay()->SwapBuffers(screen->GetEGLDisplay(), screen->GetEGLSurface());
 }
 #endif
 
diff --git a/widget/gonk/libdisplay/GonkDisplayICS.cpp b/widget/gonk/libdisplay/GonkDisplayICS.cpp
index 25edd115ff5..99634d0c64d 100644
--- a/widget/gonk/libdisplay/GonkDisplayICS.cpp
+++ b/widget/gonk/libdisplay/GonkDisplayICS.cpp
@@ -168,7 +168,14 @@ GonkDisplayICS::SwapBuffers(EGLDisplay dpy, EGLSurface sur)
 {
     // Should be called when composition rendering is complete for a frame.
     // Only HWC v1.0 needs this call. ICS gonk always needs the call.
-    return !mFBSurface->compositionComplete();
+    mFBSurface->compositionComplete();
+
+    if (!mHwc) {
+        return true;
+    }
+
+    mHwc->prepare(mHwc, nullptr);
+    return !mHwc->set(mHwc, dpy, sur, 0);
 }
 
 ANativeWindowBuffer*

From 7483e44b441f4ffce523a6b055f9308525dd033a Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Wed, 5 Aug 2015 10:38:18 +0200
Subject: [PATCH 09/56] Backed out changeset de6f45e30226 (bug 1152721) for
 XPCshell Bustage

---
 .../shared/test/unit/test_advanceValidate.js  |   4 +-
 .../devtools/styleinspector/computed-view.js  |  39 +++-
 browser/devtools/styleinspector/moz.build     |   1 -
 browser/devtools/styleinspector/rule-view.js  | 129 ++++++++++++--
 browser/devtools/styleinspector/utils.js      | 166 ------------------
 5 files changed, 154 insertions(+), 185 deletions(-)
 delete mode 100644 browser/devtools/styleinspector/utils.js

diff --git a/browser/devtools/shared/test/unit/test_advanceValidate.js b/browser/devtools/shared/test/unit/test_advanceValidate.js
index 7f86010b0b8..87194376aac 100644
--- a/browser/devtools/shared/test/unit/test_advanceValidate.js
+++ b/browser/devtools/shared/test/unit/test_advanceValidate.js
@@ -11,7 +11,7 @@ const Cu = Components.utils;
 const Ci = Components.interfaces;
 let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let require = devtools.require;
-let {advanceValidate} = require("devtools/styleinspector/rule-view");
+let {_advanceValidate} = require("devtools/styleinspector/rule-view");
 
 //                            1         2         3
 //                  0123456789012345678901234567890
@@ -19,7 +19,7 @@ let sampleInput = '\\symbol "string" url(somewhere)';
 
 function testInsertion(where, result, testName) {
   do_print(testName);
-  equal(advanceValidate(Ci.nsIDOMKeyEvent.DOM_VK_SEMICOLON, sampleInput, where),
+  equal(_advanceValidate(Ci.nsIDOMKeyEvent.DOM_VK_SEMICOLON, sampleInput, where),
         result, "testing _advanceValidate at " + where);
 }
 
diff --git a/browser/devtools/styleinspector/computed-view.js b/browser/devtools/styleinspector/computed-view.js
index 2fe90a34565..15463830270 100644
--- a/browser/devtools/styleinspector/computed-view.js
+++ b/browser/devtools/styleinspector/computed-view.js
@@ -15,10 +15,8 @@ const ToolDefinitions = require("main").Tools;
 const {CssLogic} = require("devtools/styleinspector/css-logic");
 const {ELEMENT_STYLE} = require("devtools/server/actors/styles");
 const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
-const {setTimeout, clearTimeout} = Cu.import("resource://gre/modules/Timer.jsm", {});
 const {OutputParser} = require("devtools/output-parser");
 const {PrefObserver, PREF_ORIG_SOURCES} = require("devtools/styleeditor/utils");
-const {createChild} = require("devtools/styleinspector/utils");
 const {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 
 loader.lazyRequireGetter(this, "overlays", "devtools/styleinspector/style-inspector-overlays");
@@ -72,7 +70,7 @@ UpdateProcess.prototype = {
     if (this.canceled) {
       return;
     }
-    this._timeout = setTimeout(this._timeoutHandler.bind(this), 0);
+    this._timeout = this.win.setTimeout(this._timeoutHandler.bind(this), 0);
   },
 
   /**
@@ -81,7 +79,7 @@ UpdateProcess.prototype = {
    */
   cancel: function() {
     if (this._timeout) {
-      clearTimeout(this._timeout);
+      this.win.clearTimeout(this._timeout);
       this._timeout = 0;
     }
     this.canceled = true;
@@ -510,15 +508,17 @@ CssComputedView.prototype = {
    * @param {Event} aEvent the DOM Event object.
    */
   _onFilterStyles: function(aEvent) {
+    let win = this.styleWindow;
+
     if (this._filterChangedTimeout) {
-      clearTimeout(this._filterChangedTimeout);
+      win.clearTimeout(this._filterChangedTimeout);
     }
 
     let filterTimeout = (this.searchField.value.length > 0)
       ? FILTER_CHANGED_TIMEOUT : 0;
     this.searchClearButton.hidden = this.searchField.value.length === 0;
 
-    this._filterChangedTimeout = setTimeout(() => {
+    this._filterChangedTimeout = win.setTimeout(() => {
       if (this.searchField.value.length > 0) {
         this.searchField.setAttribute("filled", true);
       } else {
@@ -1386,5 +1386,32 @@ SelectorView.prototype = {
   }
 };
 
+/**
+ * Create a child element with a set of attributes.
+ *
+ * @param {Element} aParent
+ *        The parent node.
+ * @param {string} aTag
+ *        The tag name.
+ * @param {object} aAttributes
+ *        A set of attributes to set on the node.
+ */
+function createChild(aParent, aTag, aAttributes={}) {
+  let elt = aParent.ownerDocument.createElementNS(HTML_NS, aTag);
+  for (let attr in aAttributes) {
+    if (aAttributes.hasOwnProperty(attr)) {
+      if (attr === "textContent") {
+        elt.textContent = aAttributes[attr];
+      } else if (attr === "child") {
+        elt.appendChild(aAttributes[attr]);
+      } else {
+        elt.setAttribute(attr, aAttributes[attr]);
+      }
+    }
+  }
+  aParent.appendChild(elt);
+  return elt;
+}
+
 exports.CssComputedView = CssComputedView;
 exports.PropertyView = PropertyView;
diff --git a/browser/devtools/styleinspector/moz.build b/browser/devtools/styleinspector/moz.build
index b0ffaa71c3e..e50d91589b8 100644
--- a/browser/devtools/styleinspector/moz.build
+++ b/browser/devtools/styleinspector/moz.build
@@ -14,5 +14,4 @@ EXTRA_JS_MODULES.devtools.styleinspector += [
     'style-inspector-menu.js',
     'style-inspector-overlays.js',
     'style-inspector.js',
-    'utils.js',
 ]
diff --git a/browser/devtools/styleinspector/rule-view.js b/browser/devtools/styleinspector/rule-view.js
index 93f417fc7c0..6624246c3ce 100644
--- a/browser/devtools/styleinspector/rule-view.js
+++ b/browser/devtools/styleinspector/rule-view.js
@@ -12,8 +12,6 @@
 
 const {Cc, Ci, Cu} = require("chrome");
 const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
-const {setTimeout, clearTimeout} =
-      Cu.import("resource://gre/modules/Timer.jsm", {});
 const {CssLogic} = require("devtools/styleinspector/css-logic");
 const {InplaceEditor, editableField, editableItem} =
       require("devtools/shared/inplace-editor");
@@ -21,14 +19,6 @@ const {ELEMENT_STYLE, PSEUDO_ELEMENTS} =
       require("devtools/server/actors/styles");
 const {OutputParser} = require("devtools/output-parser");
 const {PrefObserver, PREF_ORIG_SOURCES} = require("devtools/styleeditor/utils");
-const {
-  createChild,
-  appendText,
-  advanceValidate,
-  blurOnMultipleProperties,
-  promiseWarn,
-  throttle
-} = require("devtools/styleinspector/utils");
 const {
   parseDeclarations,
   parseSingleValue,
@@ -37,6 +27,7 @@ const {
   SELECTOR_ELEMENT,
   SELECTOR_PSEUDO_CLASS
 } = require("devtools/styleinspector/css-parsing-utils");
+
 loader.lazyRequireGetter(this, "overlays", "devtools/styleinspector/style-inspector-overlays");
 loader.lazyRequireGetter(this, "EventEmitter", "devtools/toolkit/event-emitter");
 loader.lazyRequireGetter(this, "StyleInspectorMenu", "devtools/styleinspector/style-inspector-menu");
@@ -59,6 +50,11 @@ const FILTER_PROP_RE = /\s*([^:\s]*)\s*:\s*(.*?)\s*;?$/;
 const IOService = Cc["@mozilla.org/network/io-service;1"]
                   .getService(Ci.nsIIOService);
 
+function promiseWarn(err) {
+  console.error(err);
+  return promise.reject(err);
+}
+
 /**
  * To figure out how shorthand properties are interpreted by the
  * engine, we will set properties on a dummy element and observe
@@ -3612,6 +3608,77 @@ UserProperties.prototype = {
  * Helper functions
  */
 
+/**
+ * Create a child element with a set of attributes.
+ *
+ * @param {Element} aParent
+ *        The parent node.
+ * @param {string} aTag
+ *        The tag name.
+ * @param {object} aAttributes
+ *        A set of attributes to set on the node.
+ */
+function createChild(aParent, aTag, aAttributes) {
+  let elt = aParent.ownerDocument.createElementNS(HTML_NS, aTag);
+  for (let attr in aAttributes) {
+    if (aAttributes.hasOwnProperty(attr)) {
+      if (attr === "textContent") {
+        elt.textContent = aAttributes[attr];
+      } else if (attr === "child") {
+        elt.appendChild(aAttributes[attr]);
+      } else {
+        elt.setAttribute(attr, aAttributes[attr]);
+      }
+    }
+  }
+  aParent.appendChild(elt);
+  return elt;
+}
+
+function setTimeout() {
+  let window = Services.appShell.hiddenDOMWindow;
+  return window.setTimeout.apply(window, arguments);
+}
+
+function clearTimeout() {
+  let window = Services.appShell.hiddenDOMWindow;
+  return window.clearTimeout.apply(window, arguments);
+}
+
+function throttle(func, wait, scope) {
+  let timer = null;
+  return function() {
+    if (timer) {
+      clearTimeout(timer);
+    }
+    let args = arguments;
+    timer = setTimeout(function() {
+      timer = null;
+      func.apply(scope, args);
+    }, wait);
+  };
+}
+
+/**
+ * Event handler that causes a blur on the target if the input has
+ * multiple CSS properties as the value.
+ */
+function blurOnMultipleProperties(e) {
+  setTimeout(() => {
+    let props = parseDeclarations(e.target.value);
+    if (props.length > 1) {
+      e.target.blur();
+    }
+  }, 0);
+}
+
+/**
+ * Append a text node to an element.
+ */
+function appendText(aParent, aText) {
+  aParent.appendChild(aParent.ownerDocument.createTextNode(aText));
+}
+
 /**
  * Walk up the DOM from a given node until a parent property holder is found.
  * For elements inside the computed property list, the non-computed parent
@@ -3675,6 +3742,48 @@ function getPropertyNameAndValue(node) {
   }
 }
 
+/**
+ * Called when a character is typed in a value editor.  This decides
+ * whether to advance or not, first by checking to see if ";" was
+ * typed, and then by lexing the input and seeing whether the ";"
+ * would be a terminator at this point.
+ *
+ * @param {number} aKeyCode Key code to be checked.
+ * @param {String} aValue   Current text editor value.
+ * @param {number} aInsertionPoint The index of the insertion point.
+ * @return {Boolean} True if the focus should advance; false if
+ *        the character should be inserted.
+ */
+function advanceValidate(aKeyCode, aValue, aInsertionPoint) {
+  // Only ";" has special handling here.
+  if (aKeyCode !== Ci.nsIDOMKeyEvent.DOM_VK_SEMICOLON) {
+    return false;
+  }
+
+  // Insert the character provisionally and see what happens.  If we
+  // end up with a ";" symbol token, then the semicolon terminates the
+  // value.  Otherwise it's been inserted in some spot where it has a
+  // valid meaning, like a comment or string.
+  aValue = aValue.slice(0, aInsertionPoint) + ";" +
+    aValue.slice(aInsertionPoint);
+  let lexer = domUtils.getCSSLexer(aValue);
+  while (true) {
+    let token = lexer.nextToken();
+    if (token.endOffset > aInsertionPoint) {
+      if (token.tokenType === "symbol" && token.text === ";") {
+        // The ";" is a terminator.
+        return true;
+      }
+      // The ";" is not a terminator in this context.
+      break;
+    }
+  }
+  return false;
+}
+
+// We're exporting _advanceValidate for unit tests.
+exports._advanceValidate = advanceValidate;
+
 XPCOMUtils.defineLazyGetter(this, "clipboardHelper", function() {
   return Cc["@mozilla.org/widget/clipboardhelper;1"]
     .getService(Ci.nsIClipboardHelper);
diff --git a/browser/devtools/styleinspector/utils.js b/browser/devtools/styleinspector/utils.js
deleted file mode 100644
index 5085ac0e4fe..00000000000
--- a/browser/devtools/styleinspector/utils.js
+++ /dev/null
@@ -1,166 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* 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/. */
-
-/* global domUtils */
-
-"use strict";
-
-const {Cc, Ci, Cu} = require("chrome");
-const {setTimeout, clearTimeout} =
-      Cu.import("resource://gre/modules/Timer.jsm", {});
-const {parseDeclarations} =
-      require("devtools/styleinspector/css-parsing-utils");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
-
-loader.lazyServiceGetter(this, "domUtils",
-  "@mozilla.org/inspector/dom-utils;1", "inIDOMUtils");
-
-const HTML_NS = "http://www.w3.org/1999/xhtml";
-
-/**
- * Create a child element with a set of attributes.
- *
- * @param {Element} parent
- *        The parent node.
- * @param {string} tagName
- *        The tag name.
- * @param {object} attributes
- *        A set of attributes to set on the node.
- */
-function createChild(parent, tagName, attributes={}) {
-  let elt = parent.ownerDocument.createElementNS(HTML_NS, tagName);
-  for (let attr in attributes) {
-    if (attributes.hasOwnProperty(attr)) {
-      if (attr === "textContent") {
-        elt.textContent = attributes[attr];
-      } else if (attr === "child") {
-        elt.appendChild(attributes[attr]);
-      } else {
-        elt.setAttribute(attr, attributes[attr]);
-      }
-    }
-  }
-  parent.appendChild(elt);
-  return elt;
-}
-
-exports.createChild = createChild;
-
-/**
- * Append a text node to an element.
- *
- * @param {Element} parent
- *        The parent node.
- * @param {string} text
- *        The text content for the text node.
- */
-function appendText(parent, text) {
-  parent.appendChild(parent.ownerDocument.createTextNode(text));
-}
-
-exports.appendText = appendText;
-
-/**
- * Called when a character is typed in a value editor.  This decides
- * whether to advance or not, first by checking to see if ";" was
- * typed, and then by lexing the input and seeing whether the ";"
- * would be a terminator at this point.
- *
- * @param {number} keyCode
- *        Key code to be checked.
- * @param {string} aValue
- *        Current text editor value.
- * @param {number} insertionPoint
- *        The index of the insertion point.
- * @return {Boolean} True if the focus should advance; false if
- *        the character should be inserted.
- */
-function advanceValidate(keyCode, value, insertionPoint) {
-  // Only ";" has special handling here.
-  if (keyCode !== Ci.nsIDOMKeyEvent.DOM_VK_SEMICOLON) {
-    return false;
-  }
-
-  // Insert the character provisionally and see what happens.  If we
-  // end up with a ";" symbol token, then the semicolon terminates the
-  // value.  Otherwise it's been inserted in some spot where it has a
-  // valid meaning, like a comment or string.
-  value = value.slice(0, insertionPoint) + ";" + value.slice(insertionPoint);
-  let lexer = domUtils.getCSSLexer(value);
-  while (true) {
-    let token = lexer.nextToken();
-    if (token.endOffset > insertionPoint) {
-      if (token.tokenType === "symbol" && token.text === ";") {
-        // The ";" is a terminator.
-        return true;
-      }
-      // The ";" is not a terminator in this context.
-      break;
-    }
-  }
-  return false;
-}
-
-exports.advanceValidate = advanceValidate;
-
-/**
- * Create a throttling function wrapper to regulate its frequency.
- *
- * @param {Function} func
- *         The function to throttle
- * @param {number} wait
- *         The throttling period
- * @param {Object} scope
- *         The scope to use for func
- * @return {Function} The throttled function
- */
-function throttle(func, wait, scope) {
-  let timer = null;
-
-  return function() {
-    if (timer) {
-      clearTimeout(timer);
-    }
-
-    let args = arguments;
-    timer = setTimeout(function() {
-      timer = null;
-      func.apply(scope, args);
-    }, wait);
-  };
-}
-
-exports.throttle = throttle;
-
-/**
- * Event handler that causes a blur on the target if the input has
- * multiple CSS properties as the value.
- */
-function blurOnMultipleProperties(e) {
-  setTimeout(() => {
-    let props = parseDeclarations(e.target.value);
-    if (props.length > 1) {
-      e.target.blur();
-    }
-  }, 0);
-}
-
-exports.blurOnMultipleProperties = blurOnMultipleProperties;
-
-/**
- * Log the provided error to the console and return a rejected Promise for
- * this error.
- *
- * @param {Error} error
- *         The error to log
- * @return {Promise} A rejected promise
- */
-function promiseWarn(error) {
-  console.error(error);
-  return promise.reject(error);
-}
-
-exports.promiseWarn = promiseWarn;

From a7ed1e490f6dbcbc7afb1f5a75e00719185994b1 Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Wed, 5 Aug 2015 11:41:36 +0200
Subject: [PATCH 10/56] Bug 1179189 - Fix semantics of e10sEnabled in the
 Telemetry environment. r=mconley

---
 toolkit/components/telemetry/TelemetryEnvironment.jsm | 3 +--
 toolkit/components/telemetry/docs/environment.rst     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/toolkit/components/telemetry/TelemetryEnvironment.jsm b/toolkit/components/telemetry/TelemetryEnvironment.jsm
index 56f447e6983..d1ab2daba49 100644
--- a/toolkit/components/telemetry/TelemetryEnvironment.jsm
+++ b/toolkit/components/telemetry/TelemetryEnvironment.jsm
@@ -147,7 +147,6 @@ const PREF_DISTRIBUTION_ID = "distribution.id";
 const PREF_DISTRIBUTION_VERSION = "distribution.version";
 const PREF_DISTRIBUTOR = "app.distributor";
 const PREF_DISTRIBUTOR_CHANNEL = "app.distributor.channel";
-const PREF_E10S_ENABLED = "browser.tabs.remote.autostart";
 const PREF_HOTFIX_LASTVERSION = "extensions.hotfix.lastVersion";
 const PREF_APP_PARTNER_BRANCH = "app.partner.";
 const PREF_PARTNER_ID = "mozilla.partner.id";
@@ -1000,7 +999,7 @@ EnvironmentCache.prototype = {
 #ifndef MOZ_WIDGET_ANDROID
       isDefaultBrowser: this._isDefaultBrowser(),
 #endif
-      e10sEnabled: Preferences.get(PREF_E10S_ENABLED, false),
+      e10sEnabled: Services.appinfo.browserTabsRemoteAutostart,
       telemetryEnabled: Preferences.get(PREF_TELEMETRY_ENABLED, false),
       locale: getBrowserLocale(),
       update: {
diff --git a/toolkit/components/telemetry/docs/environment.rst b/toolkit/components/telemetry/docs/environment.rst
index aaffcb3a0cd..f38841c5850 100644
--- a/toolkit/components/telemetry/docs/environment.rst
+++ b/toolkit/components/telemetry/docs/environment.rst
@@ -40,7 +40,7 @@ Structure::
           loadPath: <string>, // where the engine line is located; missing if no default
           submissionURL: <string> // missing if no default or for user-installed engines
         },
-        e10sEnabled: <bool>, // false on failure
+        e10sEnabled: <bool>, // whether e10s is on, i.e. browser tabs open by default in a different process
         telemetryEnabled: <bool>, // false on failure
         locale: <string>, // e.g. "it", null on failure
         update: {

From 64ffc931e5feaffbe32e6759f84a65931870c5d3 Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Wed, 5 Aug 2015 02:59:11 -0700
Subject: [PATCH 11/56] Bug 1161072 - Destroy the walker actor on disconnect.
 r=bgrins

---
 browser/devtools/framework/toolbox.js       | 80 ++++++++++-----------
 toolkit/devtools/server/actors/inspector.js | 11 ++-
 2 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/browser/devtools/framework/toolbox.js b/browser/devtools/framework/toolbox.js
index 3509717434f..e94b8a3b6ff 100644
--- a/browser/devtools/framework/toolbox.js
+++ b/browser/devtools/framework/toolbox.js
@@ -1743,52 +1743,52 @@ Toolbox.prototype = {
    * Returns a promise that resolves when the fronts are destroyed
    */
   destroyInspector: function() {
-    if (this._destroying) {
-      return this._destroying;
+    if (this._destroyingInspector) {
+      return this._destroyingInspector;
     }
 
-    if (!this._inspector) {
-      return promise.resolve();
-    }
+    return this._destroyingInspector = Task.spawn(function*() {
+      if (!this._inspector) {
+        return;
+      }
 
-    let outstanding = () => {
-      return Task.spawn(function*() {
-        yield this.highlighterUtils.stopPicker();
-        yield this._inspector.destroy();
-        if (this._highlighter) {
-          // Note that if the toolbox is closed, this will work fine, but will fail
-          // in case the browser is closed and will trigger a noSuchActor message.
-          // We ignore the promise that |_hideBoxModel| returns, since we should still
-          // proceed with the rest of destruction if it fails.
-          // FF42+ now does the cleanup from the actor.
-          if (!this.highlighter.traits.autoHideOnDestroy) {
-            this.highlighterUtils.unhighlight();
-          }
-          yield this._highlighter.destroy();
-        }
-        if (this._selection) {
-          this._selection.destroy();
+      // Releasing the walker (if it has been created)
+      // This can fail, but in any case, we want to continue destroying the
+      // inspector/highlighter/selection
+      // FF42+: Inspector actor starts managing Walker actor and auto destroy it.
+      if (this._walker && !this.walker.traits.autoReleased) {
+        try {
+          yield this._walker.release();
+        } catch(e) {}
+      }
+
+      yield this.highlighterUtils.stopPicker();
+      yield this._inspector.destroy();
+      if (this._highlighter) {
+        // Note that if the toolbox is closed, this will work fine, but will fail
+        // in case the browser is closed and will trigger a noSuchActor message.
+        // We ignore the promise that |_hideBoxModel| returns, since we should still
+        // proceed with the rest of destruction if it fails.
+        // FF42+ now does the cleanup from the actor.
+        if (!this.highlighter.traits.autoHideOnDestroy) {
+          this.highlighterUtils.unhighlight();
         }
+        yield this._highlighter.destroy();
+      }
+      if (this._selection) {
+        this._selection.destroy();
+      }
 
-        if (this.walker) {
-          this.walker.off("highlighter-ready", this._highlighterReady);
-          this.walker.off("highlighter-hide", this._highlighterHidden);
-        }
+      if (this.walker) {
+        this.walker.off("highlighter-ready", this._highlighterReady);
+        this.walker.off("highlighter-hide", this._highlighterHidden);
+      }
 
-        this._inspector = null;
-        this._highlighter = null;
-        this._selection = null;
-        this._walker = null;
-      }.bind(this));
-    };
-
-    // Releasing the walker (if it has been created)
-    // This can fail, but in any case, we want to continue destroying the
-    // inspector/highlighter/selection
-    let walker = (this._destroying = this._walker) ?
-                 this._walker.release() :
-                 promise.resolve();
-    return walker.then(outstanding, outstanding);
+      this._inspector = null;
+      this._highlighter = null;
+      this._selection = null;
+      this._walker = null;
+    }.bind(this));
   },
 
   /**
diff --git a/toolkit/devtools/server/actors/inspector.js b/toolkit/devtools/server/actors/inspector.js
index 0a4e60df52e..2933b95f111 100644
--- a/toolkit/devtools/server/actors/inspector.js
+++ b/toolkit/devtools/server/actors/inspector.js
@@ -1298,7 +1298,13 @@ var WalkerActor = protocol.ActorClass({
   form: function() {
     return {
       actor: this.actorID,
-      root: this.rootNode.form()
+      root: this.rootNode.form(),
+      traits: {
+        // FF42+ Inspector starts managing the Walker, while the inspector also
+        // starts cleaning itself up automatically on client disconnection.
+        // So that there is no need to manually release the walker anymore.
+        autoReleased: true
+      }
     }
   },
 
@@ -3108,6 +3114,8 @@ var WalkerFront = exports.WalkerFront = protocol.FrontClass(WalkerActor, {
     this.actorID = json.actor;
     this.rootNode = types.getType("domnode").read(json.root, this);
     this._rootNodeDeferred.resolve(this.rootNode);
+    // FF42+ the actor starts exposing traits
+    this.traits = json.traits || {};
   },
 
   /**
@@ -3522,6 +3530,7 @@ var InspectorActor = exports.InspectorActor = protocol.ActorClass({
       let tabActor = this.tabActor;
       window.removeEventListener("DOMContentLoaded", domReady, true);
       this.walker = WalkerActor(this.conn, tabActor, options);
+      this.manage(this.walker);
       events.once(this.walker, "destroyed", () => {
         this._walkerPromise = null;
         this._pageStylePromise = null;

From 9ceaa0f6b56c85797659403e73a88e67f6ec8a59 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Wed, 5 Aug 2015 12:32:24 +0200
Subject: [PATCH 12/56] Bug 1190826 - Rename "AddMarkerTo*" to "AddMarkerFor*"
 to reflect the new philosophy behind markers, r=tromey

---
 docshell/base/timeline/AutoGlobalTimelineMarker.cpp | 4 ++--
 docshell/base/timeline/TimelineConsumers.cpp        | 8 ++++----
 docshell/base/timeline/TimelineConsumers.h          | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docshell/base/timeline/AutoGlobalTimelineMarker.cpp b/docshell/base/timeline/AutoGlobalTimelineMarker.cpp
index 9baf8df95f1..6f38b09a27a 100644
--- a/docshell/base/timeline/AutoGlobalTimelineMarker.cpp
+++ b/docshell/base/timeline/AutoGlobalTimelineMarker.cpp
@@ -22,7 +22,7 @@ AutoGlobalTimelineMarker::AutoGlobalTimelineMarker(const char* aName
     return;
   }
 
-  TimelineConsumers::AddMarkerToAllObservedDocShells(mName, TRACING_INTERVAL_START);
+  TimelineConsumers::AddMarkerForAllObservedDocShells(mName, TRACING_INTERVAL_START);
 }
 
 AutoGlobalTimelineMarker::~AutoGlobalTimelineMarker()
@@ -31,7 +31,7 @@ AutoGlobalTimelineMarker::~AutoGlobalTimelineMarker()
     return;
   }
 
-  TimelineConsumers::AddMarkerToAllObservedDocShells(mName, TRACING_INTERVAL_END);
+  TimelineConsumers::AddMarkerForAllObservedDocShells(mName, TRACING_INTERVAL_END);
 }
 
 } // namespace mozilla
diff --git a/docshell/base/timeline/TimelineConsumers.cpp b/docshell/base/timeline/TimelineConsumers.cpp
index a55e7c55d76..13f0a05abda 100644
--- a/docshell/base/timeline/TimelineConsumers.cpp
+++ b/docshell/base/timeline/TimelineConsumers.cpp
@@ -84,8 +84,8 @@ TimelineConsumers::AddMarkerForDocShell(nsDocShell* aDocShell,
 }
 
 void
-TimelineConsumers::AddMarkerToDocShellsList(Vector<nsRefPtr<nsDocShell>>& aDocShells,
-                                            const char* aName, TracingMetadata aMetaData)
+TimelineConsumers::AddMarkerForDocShellsList(Vector<nsRefPtr<nsDocShell>>& aDocShells,
+                                             const char* aName, TracingMetadata aMetaData)
 {
   for (Vector<nsRefPtr<nsDocShell>>::Range range = aDocShells.all();
        !range.empty();
@@ -95,7 +95,7 @@ TimelineConsumers::AddMarkerToDocShellsList(Vector<nsRefPtr<nsDocShell>>& aDocSh
 }
 
 void
-TimelineConsumers::AddMarkerToAllObservedDocShells(const char* aName, TracingMetadata aMetaData)
+TimelineConsumers::AddMarkerForAllObservedDocShells(const char* aName, TracingMetadata aMetaData)
 {
   Vector<nsRefPtr<nsDocShell>> docShells;
   if (!GetKnownDocShells(docShells)) {
@@ -104,7 +104,7 @@ TimelineConsumers::AddMarkerToAllObservedDocShells(const char* aName, TracingMet
     return;
   }
 
-  AddMarkerToDocShellsList(docShells, aName, aMetaData);
+  AddMarkerForDocShellsList(docShells, aName, aMetaData);
 }
 
 } // namespace mozilla
diff --git a/docshell/base/timeline/TimelineConsumers.h b/docshell/base/timeline/TimelineConsumers.h
index fdbed071617..3540a4287cf 100644
--- a/docshell/base/timeline/TimelineConsumers.h
+++ b/docshell/base/timeline/TimelineConsumers.h
@@ -37,9 +37,9 @@ public:
                                    UniquePtr<TimelineMarker>&& aMarker);
   static void AddMarkerForDocShell(nsDocShell* aDocShell,
                                    const char* aName, TracingMetadata aMetaData);
-  static void AddMarkerToDocShellsList(Vector<nsRefPtr<nsDocShell>>& aDocShells,
-                                       const char* aName, TracingMetadata aMetaData);
-  static void AddMarkerToAllObservedDocShells(const char* aName, TracingMetadata aMetaData);
+  static void AddMarkerForDocShellsList(Vector<nsRefPtr<nsDocShell>>& aDocShells,
+                                        const char* aName, TracingMetadata aMetaData);
+  static void AddMarkerForAllObservedDocShells(const char* aName, TracingMetadata aMetaData);
 };
 
 } // namespace mozilla

From 0dd1562de8337be585ba574f0752d1ae721e2dd1 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Wed, 5 Aug 2015 14:33:40 +0200
Subject: [PATCH 13/56] Backed out changeset 2672589e571e (bug 1161072) for
 test failures in browser_tilt_picking_inspector.js

---
 browser/devtools/framework/toolbox.js       | 80 ++++++++++-----------
 toolkit/devtools/server/actors/inspector.js | 11 +--
 2 files changed, 41 insertions(+), 50 deletions(-)

diff --git a/browser/devtools/framework/toolbox.js b/browser/devtools/framework/toolbox.js
index e94b8a3b6ff..3509717434f 100644
--- a/browser/devtools/framework/toolbox.js
+++ b/browser/devtools/framework/toolbox.js
@@ -1743,52 +1743,52 @@ Toolbox.prototype = {
    * Returns a promise that resolves when the fronts are destroyed
    */
   destroyInspector: function() {
-    if (this._destroyingInspector) {
-      return this._destroyingInspector;
+    if (this._destroying) {
+      return this._destroying;
     }
 
-    return this._destroyingInspector = Task.spawn(function*() {
-      if (!this._inspector) {
-        return;
-      }
+    if (!this._inspector) {
+      return promise.resolve();
+    }
 
-      // Releasing the walker (if it has been created)
-      // This can fail, but in any case, we want to continue destroying the
-      // inspector/highlighter/selection
-      // FF42+: Inspector actor starts managing Walker actor and auto destroy it.
-      if (this._walker && !this.walker.traits.autoReleased) {
-        try {
-          yield this._walker.release();
-        } catch(e) {}
-      }
-
-      yield this.highlighterUtils.stopPicker();
-      yield this._inspector.destroy();
-      if (this._highlighter) {
-        // Note that if the toolbox is closed, this will work fine, but will fail
-        // in case the browser is closed and will trigger a noSuchActor message.
-        // We ignore the promise that |_hideBoxModel| returns, since we should still
-        // proceed with the rest of destruction if it fails.
-        // FF42+ now does the cleanup from the actor.
-        if (!this.highlighter.traits.autoHideOnDestroy) {
-          this.highlighterUtils.unhighlight();
+    let outstanding = () => {
+      return Task.spawn(function*() {
+        yield this.highlighterUtils.stopPicker();
+        yield this._inspector.destroy();
+        if (this._highlighter) {
+          // Note that if the toolbox is closed, this will work fine, but will fail
+          // in case the browser is closed and will trigger a noSuchActor message.
+          // We ignore the promise that |_hideBoxModel| returns, since we should still
+          // proceed with the rest of destruction if it fails.
+          // FF42+ now does the cleanup from the actor.
+          if (!this.highlighter.traits.autoHideOnDestroy) {
+            this.highlighterUtils.unhighlight();
+          }
+          yield this._highlighter.destroy();
+        }
+        if (this._selection) {
+          this._selection.destroy();
         }
-        yield this._highlighter.destroy();
-      }
-      if (this._selection) {
-        this._selection.destroy();
-      }
 
-      if (this.walker) {
-        this.walker.off("highlighter-ready", this._highlighterReady);
-        this.walker.off("highlighter-hide", this._highlighterHidden);
-      }
+        if (this.walker) {
+          this.walker.off("highlighter-ready", this._highlighterReady);
+          this.walker.off("highlighter-hide", this._highlighterHidden);
+        }
 
-      this._inspector = null;
-      this._highlighter = null;
-      this._selection = null;
-      this._walker = null;
-    }.bind(this));
+        this._inspector = null;
+        this._highlighter = null;
+        this._selection = null;
+        this._walker = null;
+      }.bind(this));
+    };
+
+    // Releasing the walker (if it has been created)
+    // This can fail, but in any case, we want to continue destroying the
+    // inspector/highlighter/selection
+    let walker = (this._destroying = this._walker) ?
+                 this._walker.release() :
+                 promise.resolve();
+    return walker.then(outstanding, outstanding);
   },
 
   /**
diff --git a/toolkit/devtools/server/actors/inspector.js b/toolkit/devtools/server/actors/inspector.js
index 2933b95f111..0a4e60df52e 100644
--- a/toolkit/devtools/server/actors/inspector.js
+++ b/toolkit/devtools/server/actors/inspector.js
@@ -1298,13 +1298,7 @@ var WalkerActor = protocol.ActorClass({
   form: function() {
     return {
       actor: this.actorID,
-      root: this.rootNode.form(),
-      traits: {
-        // FF42+ Inspector starts managing the Walker, while the inspector also
-        // starts cleaning itself up automatically on client disconnection.
-        // So that there is no need to manually release the walker anymore.
-        autoReleased: true
-      }
+      root: this.rootNode.form()
     }
   },
 
@@ -3114,8 +3108,6 @@ var WalkerFront = exports.WalkerFront = protocol.FrontClass(WalkerActor, {
     this.actorID = json.actor;
     this.rootNode = types.getType("domnode").read(json.root, this);
     this._rootNodeDeferred.resolve(this.rootNode);
-    // FF42+ the actor starts exposing traits
-    this.traits = json.traits || {};
   },
 
   /**
@@ -3530,7 +3522,6 @@ var InspectorActor = exports.InspectorActor = protocol.ActorClass({
       let tabActor = this.tabActor;
       window.removeEventListener("DOMContentLoaded", domReady, true);
       this.walker = WalkerActor(this.conn, tabActor, options);
-      this.manage(this.walker);
       events.once(this.walker, "destroyed", () => {
         this._walkerPromise = null;
         this._pageStylePromise = null;

From 95ac107c8c4579c7ae1fc76a85b7ff384564210f Mon Sep 17 00:00:00 2001
From: Chris Rafuse <chris.rafuse@priologic.com>
Date: Tue, 4 Aug 2015 16:27:00 -0400
Subject: [PATCH 14/56] Bug 1181991 - Change e-mail invitation text to improve
 CTR. r=andreio

---
 .../components/loop/content/js/roomStore.js   | 13 +++-----
 .../loop/content/shared/js/utils.js           | 33 +++++--------------
 .../loop/test/desktop-local/roomStore_test.js |  2 +-
 .../components/loop/test/shared/utils_test.js | 14 ++++----
 .../en-US/chrome/browser/loop/loop.properties | 17 ++++------
 5 files changed, 28 insertions(+), 51 deletions(-)

diff --git a/browser/components/loop/content/js/roomStore.js b/browser/components/loop/content/js/roomStore.js
index 8dc9765db96..dc67c92324d 100644
--- a/browser/components/loop/content/js/roomStore.js
+++ b/browser/components/loop/content/js/roomStore.js
@@ -370,16 +370,11 @@ loop.store = loop.store || {};
 
       switch (providerOrigin) {
         case "mail.google.com":
-          shareTitle = mozL10n.get("share_email_subject5", {
-            clientShortname2: mozL10n.get("clientShortname2")
-          });
-          shareBody = mozL10n.get("share_email_body5", {
-            callUrl: actionData.roomUrl,
-            brandShortname: mozL10n.get("brandShortname"),
-            clientShortname2: mozL10n.get("clientShortname2"),
-            clientSuperShortname: mozL10n.get("clientSuperShortname"),
-            learnMoreUrl: this._mozLoop.getLoopPref("learnMoreUrl")
+          shareTitle = mozL10n.get("share_email_subject6");
+          shareBody = mozL10n.get("share_email_body6", {
+            callUrl: actionData.roomUrl
           });
+          shareBody += mozL10n.get("share_email_footer");
           break;
         case "twitter.com":
         default:
diff --git a/browser/components/loop/content/shared/js/utils.js b/browser/components/loop/content/shared/js/utils.js
index b1867a246c2..3b622121c28 100644
--- a/browser/components/loop/content/shared/js/utils.js
+++ b/browser/components/loop/content/shared/js/utils.js
@@ -398,40 +398,25 @@ var inChrome = typeof Components != "undefined" && "utils" in Components;
     }
 
     var subject, body;
-    var brandShortname = mozL10n.get("brandShortname");
-    var clientShortname2 = mozL10n.get("clientShortname2");
-    var clientSuperShortname = mozL10n.get("clientSuperShortname");
-    var learnMoreUrl = mozLoop.getLoopPref("learnMoreUrl");
+    var footer = mozL10n.get("share_email_footer");
 
     if (contextDescription) {
-      subject = mozL10n.get("share_email_subject_context", {
-        clientShortname2: clientShortname2,
-        title: contextDescription
-      });
-      body = mozL10n.get("share_email_body_context", {
+      subject = mozL10n.get("share_email_subject6");
+      body = mozL10n.get("share_email_body_context2", {
         callUrl: callUrl,
-        brandShortname: brandShortname,
-        clientShortname2: clientShortname2,
-        clientSuperShortname: clientSuperShortname,
-        learnMoreUrl: learnMoreUrl,
         title: contextDescription
       });
     } else {
-      subject = mozL10n.get("share_email_subject5", {
-        clientShortname2: clientShortname2
-      });
-      body = mozL10n.get("share_email_body5", {
-        callUrl: callUrl,
-        brandShortname: brandShortname,
-        clientShortname2: clientShortname2,
-        clientSuperShortname: clientSuperShortname,
-        learnMoreUrl: learnMoreUrl
+      subject = mozL10n.get("share_email_subject6");
+      body = mozL10n.get("share_email_body6", {
+        callUrl: callUrl
       });
     }
-
+    var bodyFooter =  body + footer;
+    bodyFooter = bodyFooter.replace(/\r\n/g, "\n").replace(/\n/g, "\r\n");
     mozLoop.composeEmail(
       subject,
-      body.replace(/\r\n/g, "\n").replace(/\n/g, "\r\n"),
+      bodyFooter,
       recipient
     );
 
diff --git a/browser/components/loop/test/desktop-local/roomStore_test.js b/browser/components/loop/test/desktop-local/roomStore_test.js
index c85b39ff88f..1b87cd95e5b 100644
--- a/browser/components/loop/test/desktop-local/roomStore_test.js
+++ b/browser/components/loop/test/desktop-local/roomStore_test.js
@@ -581,7 +581,7 @@ describe("loop.store.RoomStore", function () {
 
         sinon.assert.calledOnce(fakeMozLoop.socialShareRoom);
         sinon.assert.calledWithExactly(fakeMozLoop.socialShareRoom, origin,
-          roomUrl, "share_email_subject5", "share_email_body5");
+          roomUrl, "share_email_subject6", "share_email_body6" + "share_email_footer");
       });
 
       it("should pass the correct data for all other Social Providers", function() {
diff --git a/browser/components/loop/test/shared/utils_test.js b/browser/components/loop/test/shared/utils_test.js
index b6888ccf774..4f4aecddc56 100644
--- a/browser/components/loop/test/shared/utils_test.js
+++ b/browser/components/loop/test/shared/utils_test.js
@@ -355,14 +355,14 @@ describe("loop.shared.utils", function() {
       // fake mozL10n
       sandbox.stub(navigator.mozL10n, "get", function(id) {
         switch(id) {
-          case "share_email_subject5":
+          case "share_email_subject6":
             return "subject";
-          case "share_email_body5":
+          case "share_email_body6":
             return "body";
-          case "share_email_subject_context":
-            return "subject_context";
-          case "share_email_body_context":
+          case "share_email_body_context2":
             return "body_context";
+          case "share_email_footer":
+            return "footer";
         }
       });
       composeEmail = sandbox.spy();
@@ -385,14 +385,14 @@ describe("loop.shared.utils", function() {
 
       sinon.assert.calledOnce(composeEmail);
       sinon.assert.calledWith(composeEmail,
-                              "subject", "body", "fake@invalid.tld");
+                              "subject", "body" + "footer", "fake@invalid.tld");
     });
 
     it("should compose a different email when context info is provided", function() {
       sharedUtils.composeCallUrlEmail("http://invalid", null, "Hello, is me you're looking for?");
 
       sinon.assert.calledOnce(composeEmail);
-      sinon.assert.calledWith(composeEmail, "subject_context", "body_context");
+      sinon.assert.calledWith(composeEmail, "subject", "body_context" + "footer");
     });
 
     it("should record a telemetry event when an email is composed", function() {
diff --git a/browser/locales/en-US/chrome/browser/loop/loop.properties b/browser/locales/en-US/chrome/browser/loop/loop.properties
index 52efe6e1d28..1cb32927d13 100644
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -55,18 +55,15 @@ problem_accessing_account=There Was A Problem Accessing Your Account
 ## the appropriate action.
 retry_button=Retry
 
-share_email_subject5={{clientShortname2}} — Join the conversation
-## LOCALIZATION NOTE (share_email_subject_context): This is the alternate email
-## subject when a conversation is shared with a context attached.
-## {{clientShortName2}} will be replaced with the respective string in this file.
-## {{title}} will be replaced with the title of an HTML document.
-share_email_subject_context={{clientShortname2}} conversation: {{title}}
-## LOCALIZATION NOTE (share_email_body4): In this item, don't translate the
+share_email_subject6=Join me for a video conversation
+## LOCALIZATION NOTE (share_email_body6): In this item, don't translate the
 ## part between {{..}} and leave the \n\n part alone
-share_email_body5=Hello!\n\nJoin me for a video conversation on {{clientShortname2}}.\n\nIt's the easiest way to connect by video with anyone anywhere.  With {{clientSuperShortname}}, you don't have to download or install anything. Just click or paste this link into your {{brandShortname}}, Opera or Chrome browser to join the conversation:\n\n{{callUrl}}\n\nIf you'd like to learn more about {{clientSuperShortname}} and how you can start your own free video conversations, visit {{learnMoreUrl}}\n\nTalk to you soon!
-## LOCALIZATION NOTE (share_email_body_context): In this item, don't translate
+share_email_body6=Click the Firefox Hello link to connect to the conversation now: {{callUrl}}
+## LOCALIZATION NOTE (share_email_body_context2): In this item, don't translate
 ## the part between {{..}} and leave the \n\n part alone.
-share_email_body_context=Hello!\n\nJoin me for a video conversation on {{clientShortname2}} about:\n{{title}}.\n\nIt's the easiest way to connect by video with anyone anywhere.  With {{clientSuperShortname}}, you don't have to download or install anything. Just click or paste this link into your {{brandShortname}}, Opera or Chrome browser to join the conversation:\n\n{{callUrl}}\n\nIf you'd like to learn more about {{clientSuperShortname}} and how you can start your own free video conversations, visit {{learnMoreUrl}}\n\nTalk to you soon!
+share_email_body_context2=Join me for a video conversation. Click the Firefox Hello link to connect now: {{callUrl}}\n\nLet’s talk about this during our conversation: {{title}}
+## LOCALIZATION NOTE (share_email_footer): Common footer content for both email types
+share_email_footer=\n\n________\nJoin and create video conversations free with Firefox Hello. Connect easily over video with anyone, anywhere. No downloads or registration. Learn more at http://www.firefox.com/hello
 ## LOCALIZATION NOTE (share_tweeet): In this item, don't translate the part
 ## between {{..}}. Please keep the text below 117 characters to make sure it fits
 ## in a tweet.

From 8302c595fb83d0b3358776b915408528c3efc3c9 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 4 Aug 2015 23:23:26 -0700
Subject: [PATCH 15/56] Bumping manifests a=b2g-bump

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

diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index eed6e134c20..0827f7bccd0 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -137,12 +137,12 @@
   <project name="platform_frameworks_base" path="frameworks/base" remote="b2g" revision="04e26ebdc36ca83f4ee3e9e2082b3fcf04c5b971"/>
   <project name="platform_frameworks_wilhelm" path="frameworks/wilhelm" remote="b2g" revision="0dbf5baafadf6d233c0a29e392fa3293f0121673"/>
   <project name="platform_system_core" path="system/core" remote="b2g" revision="f594bc64eacac490857748b1139ffcb34c856bbd"/>
+  <project name="platform_external_sepolicy" path="external/sepolicy" remote="b2g" revision="3f6be48a46c54dd8cacaf216ab5b145de5ffefd2"/>
   <default remote="caf" revision="refs/tags/android-5.1.0_r1" sync-j="4"/>
   <!-- Emulator specific things -->
   <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="fe7df1bc8dd0fd71571505d7be1c31a4ad1e40fb"/>
   <project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="48132ec0b0dfe9fc29c7c3f0e799066be8999198"/>
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="59e434cbecc02653f44cedeb2ef5cc88dc8bb61b"/>
-  <project name="platform_external_sepolicy" path="external/sepolicy" remote="b2g" revision="3f6be48a46c54dd8cacaf216ab5b145de5ffefd2"/>
   <project name="platform_external_wpa_supplicant_8" path="external/wpa_supplicant_8" remote="b2g" revision="cbda29a58abc4ea1f7f4611fe354ab67b606219d"/>
   <project name="platform/development" path="development" revision="0c51f6e0aa2ee57fcb75ec3b2ff6bf754cece63e"/>
   <project name="android-sdk" path="sdk" remote="b2g" revision="ff4190dc603f62a7caa48342aa268acf99863c5c"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 8bd84799463..667da077a0b 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -137,12 +137,12 @@
   <project name="platform_frameworks_base" path="frameworks/base" remote="b2g" revision="04e26ebdc36ca83f4ee3e9e2082b3fcf04c5b971"/>
   <project name="platform_frameworks_wilhelm" path="frameworks/wilhelm" remote="b2g" revision="0dbf5baafadf6d233c0a29e392fa3293f0121673"/>
   <project name="platform_system_core" path="system/core" remote="b2g" revision="f594bc64eacac490857748b1139ffcb34c856bbd"/>
+  <project name="platform_external_sepolicy" path="external/sepolicy" remote="b2g" revision="3f6be48a46c54dd8cacaf216ab5b145de5ffefd2"/>
   <default remote="caf" revision="refs/tags/android-5.1.0_r1" sync-j="4"/>
   <!-- Nexus 5 specific things -->
   <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="fe7df1bc8dd0fd71571505d7be1c31a4ad1e40fb"/>
   <project name="device-hammerhead" path="device/lge/hammerhead" remote="b2g" revision="e728bf3ff61dfab1b97c2416096a3b850b47cf25"/>
   <project name="device_lge_hammerhead-kernel" path="device/lge/hammerhead-kernel" remote="b2g" revision="8b3ffcfdd3d3852eca5488628f8bb2a08acbffa7"/>
-  <project name="platform_external_sepolicy" path="external/sepolicy" remote="b2g" revision="3f6be48a46c54dd8cacaf216ab5b145de5ffefd2"/>
   <project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="5d0ae53d9588c3d70c005aec9be94af9a534de16"/>
   <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="c15b6e266136cd0cdd9b94d0bbed1962d9dd6672"/>
   <project name="platform/hardware/broadcom/libbt" path="hardware/broadcom/libbt" revision="399fe3d3c8f38c599a56becddc456133e62a5d70"/>

From d5ffecab01751d2fa39c52c07b12f7493a3f8a5b Mon Sep 17 00:00:00 2001
From: Jamin Liu <jaliu@mozilla.com>
Date: Wed, 5 Aug 2015 14:27:33 +0800
Subject: [PATCH 16/56] Bug 1190337 - Log GPS status and SVs status if the
 'gDebug_isLoggingEnabled' is true. r=garvank

---
 .../gonk/GonkGPSGeolocationProvider.cpp       | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/dom/system/gonk/GonkGPSGeolocationProvider.cpp b/dom/system/gonk/GonkGPSGeolocationProvider.cpp
index eb00d0f56d5..18d45995b90 100644
--- a/dom/system/gonk/GonkGPSGeolocationProvider.cpp
+++ b/dom/system/gonk/GonkGPSGeolocationProvider.cpp
@@ -134,6 +134,12 @@ GonkGPSGeolocationProvider::LocationCallback(GpsLocation* location)
   // current time, most notably: the geolocation service which respects maximumAge
   // set in the DOM JS.
 
+  if (gDebug_isLoggingEnabled) {
+    nsContentUtils::LogMessageToConsole("geo: GPS got a fix (%f, %f). accuracy: %f",
+                                        location->latitude,
+                                        location->longitude,
+                                        location->accuracy);
+  }
 
   NS_DispatchToMainThread(new UpdateLocationEvent(somewhere));
 }
@@ -141,11 +147,78 @@ GonkGPSGeolocationProvider::LocationCallback(GpsLocation* location)
 void
 GonkGPSGeolocationProvider::StatusCallback(GpsStatus* status)
 {
+  if (gDebug_isLoggingEnabled) {
+    switch (status->status) {
+      case GPS_STATUS_NONE:
+        nsContentUtils::LogMessageToConsole("geo: GPS_STATUS_NONE\n");
+        break;
+      case GPS_STATUS_SESSION_BEGIN:
+        nsContentUtils::LogMessageToConsole("geo: GPS_STATUS_SESSION_BEGIN\n");
+        break;
+      case GPS_STATUS_SESSION_END:
+        nsContentUtils::LogMessageToConsole("geo: GPS_STATUS_SESSION_END\n");
+        break;
+      case GPS_STATUS_ENGINE_ON:
+        nsContentUtils::LogMessageToConsole("geo: GPS_STATUS_ENGINE_ON\n");
+        break;
+      case GPS_STATUS_ENGINE_OFF:
+        nsContentUtils::LogMessageToConsole("geo: GPS_STATUS_ENGINE_OFF\n");
+        break;
+      default:
+        nsContentUtils::LogMessageToConsole("geo: Unknown GPS status\n");
+        break;
+    }
+  }
 }
 
 void
 GonkGPSGeolocationProvider::SvStatusCallback(GpsSvStatus* sv_info)
 {
+  if (gDebug_isLoggingEnabled) {
+    static int numSvs = 0;
+    static uint32_t numEphemeris = 0;
+    static uint32_t numAlmanac = 0;
+    static uint32_t numUsedInFix = 0;
+
+    unsigned int i = 1;
+    uint32_t svAlmanacCount = 0;
+    for (i = 1; i > 0; i <<= 1) {
+      if (i & sv_info->almanac_mask) {
+        svAlmanacCount++;
+      }
+    }
+
+    uint32_t svEphemerisCount = 0;
+    for (i = 1; i > 0; i <<= 1) {
+      if (i & sv_info->ephemeris_mask) {
+        svEphemerisCount++;
+      }
+    }
+
+    uint32_t svUsedCount = 0;
+    for (i = 1; i > 0; i <<= 1) {
+      if (i & sv_info->used_in_fix_mask) {
+        svUsedCount++;
+      }
+    }
+
+    // Log the message only if the the status changed.
+    if (sv_info->num_svs != numSvs ||
+        svAlmanacCount != numAlmanac ||
+        svEphemerisCount != numEphemeris ||
+        svUsedCount != numUsedInFix) {
+
+      nsContentUtils::LogMessageToConsole(
+        "geo: Number of SVs have (visibility, almanac, ephemeris): (%d, %d, %d)."
+        "  %d of these SVs were used in fix.\n",
+        sv_info->num_svs, svAlmanacCount, svEphemerisCount, svUsedCount);
+
+      numSvs = sv_info->num_svs;
+      numAlmanac = svAlmanacCount;
+      numEphemeris = svEphemerisCount;
+      numUsedInFix = svUsedCount;
+    }
+  }
 }
 
 void

From 25276a18064c7f2742c06dae0687dbe58e5c7a88 Mon Sep 17 00:00:00 2001
From: Jessica Jong <jjong@mozilla.com>
Date: Wed, 5 Aug 2015 16:29:20 +0800
Subject: [PATCH 17/56] Bug 1156231 - enable data registration recovery.
 r=hsinyi

---
 .../gonk/MobileConnectionService.js           | 107 ++++++++++++++++++
 dom/system/gonk/DataCallManager.js            |   4 +
 dom/system/gonk/nsIDataCallManager.idl        |   4 +-
 3 files changed, 114 insertions(+), 1 deletion(-)

diff --git a/dom/mobileconnection/gonk/MobileConnectionService.js b/dom/mobileconnection/gonk/MobileConnectionService.js
index 8e57f023796..265fc1e88a0 100644
--- a/dom/mobileconnection/gonk/MobileConnectionService.js
+++ b/dom/mobileconnection/gonk/MobileConnectionService.js
@@ -60,6 +60,14 @@ XPCOMUtils.defineLazyServiceGetter(this, "gIccService",
                                    "@mozilla.org/icc/iccservice;1",
                                    "nsIIccService");
 
+XPCOMUtils.defineLazyServiceGetter(this, "gDataCallManager",
+                                   "@mozilla.org/datacall/manager;1",
+                                   "nsIDataCallManager");
+
+XPCOMUtils.defineLazyModuleGetter(this, "gTelephonyUtils",
+                                  "resource://gre/modules/TelephonyUtils.jsm",
+                                  "TelephonyUtils");
+
 XPCOMUtils.defineLazyGetter(this, "gRadioInterfaceLayer", function() {
   let ril = { numRadioInterfaces: 0 };
   try {
@@ -720,6 +728,105 @@ MobileConnectionProvider.prototype = {
     if (isUpdated && !aBatch) {
       this.deliverListenerEvent("notifyDataChanged");
     }
+
+    if (isUpdated) {
+      this._ensureDataRegistration();
+    }
+  },
+
+  _dataRegistrationFailed: false,
+  _ensureDataRegistration: function() {
+    let isDataRegistered =
+      this.data &&
+      this.data.state == RIL.GECKO_MOBILE_CONNECTION_STATE_REGISTERED;
+    let isVoiceRegistered =
+      this.voice &&
+      this.voice.state == RIL.GECKO_MOBILE_CONNECTION_STATE_REGISTERED;
+
+    if (isVoiceRegistered && isDataRegistered) {
+      if (DEBUG) {
+        this._debug("Voice and data registered.");
+      }
+      this._dataRegistrationFailed = false;
+      return;
+    }
+
+    if (isVoiceRegistered && !isDataRegistered &&
+        this._clientId == gDataCallManager.dataDefaultServiceId) {
+
+      // We have been here before, no more recovery.
+      if (this._dataRegistrationFailed) {
+        if (DEBUG) {
+          this._debug("Voice and data not consistent: " + this.voice.state +
+                      " != " + this.data.state + ".");
+        }
+        return;
+      }
+
+      if (DEBUG) {
+        this._debug("Voice and data not consistent: " + this.voice.state +
+                    " != " + this.data.state + ", try to recover.");
+      }
+
+      this._dataRegistrationFailed = true;
+      // If there is any ongoing call, wait for them to disconnect.
+      if (gTelephonyUtils.hasAnyCalls(this._clientId)) {
+        gTelephonyUtils.waitForNoCalls(this._clientId)
+          .then(() => {
+            if (this._dataRegistrationFailed) {
+              this._recoverDataRegistration();
+            }
+          });
+        return;
+      }
+
+      this._recoverDataRegistration();
+    }
+  },
+
+
+  /**
+   * To recover data registration, get the current preferred network type first,
+   * then set it to a temporary preferred network type, and last set back to the
+   * previous preferred network type. This is will cause deregistration and
+   * registration on both voice and data networks.
+   */
+  _recoverDataRegistration: function() {
+    if (DEBUG) {
+      this._debug("Trying to recover data registration...");
+    }
+
+    let currentPreferredNetworkType;
+
+    let resetPreferredNetworkType = () => {
+      this.setPreferredNetworkType(currentPreferredNetworkType, {
+        QueryInterface: XPCOMUtils.generateQI([Ci.nsIMobileConnectionCallback]),
+        notifySuccess: () => {},
+        notifyError: aErrorMsg => {}
+      });
+    };
+
+    let setTemporaryPreferredNetworkType = () => {
+      this.setPreferredNetworkType(
+        Ci.nsIMobileConnection.PREFERRED_NETWORK_TYPE_WCDMA_GSM_CDMA_EVDO, {
+          QueryInterface: XPCOMUtils.generateQI([Ci.nsIMobileConnectionCallback]),
+          notifySuccess: () =>  resetPreferredNetworkType(),
+          notifyError: aErrorMsg => resetPreferredNetworkType()
+      });
+    };
+
+    this.getPreferredNetworkType({
+      QueryInterface: XPCOMUtils.generateQI([Ci.nsIMobileConnectionCallback]),
+      notifyGetPreferredNetworkTypeSuccess: networkType => {
+        currentPreferredNetworkType = networkType;
+        setTemporaryPreferredNetworkType();
+      },
+      notifyError: aErrorMsg => {
+        currentPreferredNetworkType =
+          Ci.nsIMobileConnection.PREFERRED_NETWORK_TYPE_LTE_WCDMA_GSM_CDMA_EVDO;
+        setTemporaryPreferredNetworkType();
+      }
+    });
   },
 
   updateOperatorInfo: function(aNewInfo, aBatch = false) {
diff --git a/dom/system/gonk/DataCallManager.js b/dom/system/gonk/DataCallManager.js
index 0d8431be5f3..b29ecfa1a85 100644
--- a/dom/system/gonk/DataCallManager.js
+++ b/dom/system/gonk/DataCallManager.js
@@ -149,6 +149,10 @@ DataCallManager.prototype = {
     dump("-*- DataCallManager: " + aMsg + "\n");
   },
 
+  get dataDefaultServiceId() {
+    return this._dataDefaultClientId;
+  },
+
   getDataCallHandler: function(aClientId) {
     let handler = this._connectionHandlers[aClientId]
     if (!handler) {
diff --git a/dom/system/gonk/nsIDataCallManager.idl b/dom/system/gonk/nsIDataCallManager.idl
index 7c7f81f09da..780887600de 100644
--- a/dom/system/gonk/nsIDataCallManager.idl
+++ b/dom/system/gonk/nsIDataCallManager.idl
@@ -55,9 +55,11 @@ interface nsIDataCallHandler : nsISupports
   void updateRILNetworkInterface();
 };
 
-[scriptable, uuid(aac54873-5771-4093-a72b-fe39967c6607)]
+[scriptable, uuid(2c46e37d-88dc-4d25-bb37-e1c0d3e9cb5f)]
 interface nsIDataCallManager : nsISupports
 {
+  readonly attribute long dataDefaultServiceId;
+
   /**
    * Get the corresponding data call handler.
    *

From 9a3b2d4b21802bf358edcd994d4bc497b27b93cb Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 01:50:18 -0700
Subject: [PATCH 18/56] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

========

https://hg.mozilla.org/integration/gaia-central/rev/9a9d80336c04
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #31101 from arcturus/bug-1178529

Bug 1178529 - [Contacts] Contacts list will be dismissed when user at…

========

https://hg.mozilla.org/integration/gaia-central/rev/06cc3809f2e8
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 1178529 - [Contacts] Contacts list will be dismissed when user attempts to import contacts the second time from an email account that didnt have any on the first attempt r=borjasalguero
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 59cce3cc41a..cf80ba1a5fb 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "581de383687dc441a878d2c91a0167c6ec688fef", 
+        "git_revision": "b795c40b149dbfed5348919c4550856bcab7069f", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "a0015e0f59bdec57f732c805238172bd49406ab5", 
+    "revision": "9a9d80336c04d5d2430790cad739fbdaaf2dc2df", 
     "repo_path": "integration/gaia-central"
 }

From e4ebffa703851e020e4c5972043241f03a4874c4 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 01:51:56 -0700
Subject: [PATCH 19/56] Bumping manifests a=b2g-bump

---
 b2g/config/aries/sources.xml        | 2 +-
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index 4ab7c606707..9c10ea0f3b6 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 9c9c9bcf7c2..7c5197ae3d4 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 52fbe54ab28..de7716ef702 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="581de383687dc441a878d2c91a0167c6ec688fef"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 20b85eacd1e..8473cf6080c 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="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 94499e7b598..72521835e62 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 0827f7bccd0..1169a64821f 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 52fbe54ab28..de7716ef702 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="581de383687dc441a878d2c91a0167c6ec688fef"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 54ab9ec521f..42979540094 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 5b1c6c09a18..1b80b8dd492 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 667da077a0b..d880cf1066b 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 80a9097286646b9d4924d3bcd4851819c04be3bf Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 03:20:33 -0700
Subject: [PATCH 20/56] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

========

https://hg.mozilla.org/integration/gaia-central/rev/7dd29bbb9715
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #31227 from timdream/jszhuyin-bump

Bug 1190736 - Bump JSZhuyin version, r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/7175d3c40040
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1190736 - Bump JSZhuyin version

hash=12ca301ed6ea3f728977e6a4de3bbb6d941011ae

========

https://hg.mozilla.org/integration/gaia-central/rev/41b1a45bb740
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #31235 from julienw/1190834-disable-signing-require

Bug 1190834 - Firefox requiring add-on signing breaks httpd.js r=ricky

========

https://hg.mozilla.org/integration/gaia-central/rev/981b2862d2f5
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1190834 - Firefox requiring add-on signing breaks httpd.js r=ricky

========

https://hg.mozilla.org/integration/gaia-central/rev/164a4692583a
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #31097 from arcturus/bug-1178241

Bug 1178241 - [vCard] 'undefined' is displayed when a field exist but…

========

https://hg.mozilla.org/integration/gaia-central/rev/0df1d22a359e
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 1178241 - [vCard] 'undefined' is displayed when a field exist but there's no value in it r=borjasalguero
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index cf80ba1a5fb..5a35a3d475e 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "b795c40b149dbfed5348919c4550856bcab7069f", 
+        "git_revision": "fded072aa1883f8c5c0fcc42d33de1f1d5b13717", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "9a9d80336c04d5d2430790cad739fbdaaf2dc2df", 
+    "revision": "7dd29bbb97154f2de44fe9d275c58005fd792406", 
     "repo_path": "integration/gaia-central"
 }

From 70107092754fbf397bcab695bb3923a5309c2ed4 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 03:22:11 -0700
Subject: [PATCH 21/56] Bumping manifests a=b2g-bump

---
 b2g/config/aries/sources.xml        | 2 +-
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index 9c10ea0f3b6..23e3d05188d 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 7c5197ae3d4..e9585a4f016 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index de7716ef702..6630c6f21a0 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="b795c40b149dbfed5348919c4550856bcab7069f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 8473cf6080c..ad71c87ee15 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="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 72521835e62..6c431ef0952 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 1169a64821f..ed0f4a8c11f 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index de7716ef702..6630c6f21a0 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="b795c40b149dbfed5348919c4550856bcab7069f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 42979540094..70a194c3497 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 1b80b8dd492..4106d098f39 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index d880cf1066b..8a24278e122 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b795c40b149dbfed5348919c4550856bcab7069f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 8014a99363f96f4627700960586047120faaf1f2 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 03:55:37 -0700
Subject: [PATCH 22/56] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/32b923e71e58
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #31172 from gasolin/issue-1149715

Bug 1149715 - [Bluetooth] Keep Receive file request when clearing notifications, r=tim

========

https://hg.mozilla.org/integration/gaia-central/rev/0bd4d3ef81d2
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1149715 - [Bluetooth] Keep Receive file request when clearing notifications, r=tim

========

https://hg.mozilla.org/integration/gaia-central/rev/a58043e6961b
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Merge pull request #31137 from mermi/testLoginBzlite

Bug 1180624 - [Bugzilla Lite] Testing the Log in to Bugzilla Lite

========

https://hg.mozilla.org/integration/gaia-central/rev/a3eddcdb31e6
Author: mermi <manel.rhaiem92@gmail.com>
Desc: Bug 1180624 - [Bugzilla Lite] Testing the Log in to Bugzilla Lite
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 5a35a3d475e..e61ee25ad48 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "fded072aa1883f8c5c0fcc42d33de1f1d5b13717", 
+        "git_revision": "4565a2f2104946575e7c0dbdd67e86daa558b022", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "7dd29bbb97154f2de44fe9d275c58005fd792406", 
+    "revision": "32b923e71e587403614e62c0a9ecb35e7c7a7554", 
     "repo_path": "integration/gaia-central"
 }

From 17a783a092d2f23052644ff3075944e82ec95f92 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 03:57:14 -0700
Subject: [PATCH 23/56] Bumping manifests a=b2g-bump

---
 b2g/config/aries/sources.xml        | 2 +-
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index 23e3d05188d..f865e224766 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index e9585a4f016..c2356bd74f6 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 6630c6f21a0..4d453d76f9f 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="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index ad71c87ee15..7b069f50926 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="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 6c431ef0952..2e8ce007fcb 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index ed0f4a8c11f..4faa9562d53 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 6630c6f21a0..4d453d76f9f 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="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 70a194c3497..9bd30706862 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 4106d098f39..c606bde7fd7 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 8a24278e122..dc613edbc2f 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fded072aa1883f8c5c0fcc42d33de1f1d5b13717"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From ff876a111638928f06a55736de2258978f78d2fa Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 04:03:33 -0700
Subject: [PATCH 24/56] Bumping manifests a=b2g-bump

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

diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 4faa9562d53..560b8019f4d 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -146,5 +146,5 @@
   <project name="platform_external_wpa_supplicant_8" path="external/wpa_supplicant_8" remote="b2g" revision="cbda29a58abc4ea1f7f4611fe354ab67b606219d"/>
   <project name="platform/development" path="development" revision="0c51f6e0aa2ee57fcb75ec3b2ff6bf754cece63e"/>
   <project name="android-sdk" path="sdk" remote="b2g" revision="ff4190dc603f62a7caa48342aa268acf99863c5c"/>
-  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2210a0276fa000ef7224f26b24f00cb34a372e8d"/>
+  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="10d289639ea62f2f6fcfb5bbf6121c484e95f767"/>
 </manifest>

From 487328bd30cc352ae566eb16ae41074fa4e872b3 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 04:15:20 -0700
Subject: [PATCH 25/56] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/dfa3968a3d5c
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Bug 1180624 - [Bugzilla Lite] Testing the Log in to Bugzilla Lite

Follow up on nits. See https://bugzilla.mozilla.org/show_bug.cgi?id=1180624#c13
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index e61ee25ad48..5b8bfbe915f 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "4565a2f2104946575e7c0dbdd67e86daa558b022", 
+        "git_revision": "283e40fe02f5a91af4545c23ba90a678822686fb", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "32b923e71e587403614e62c0a9ecb35e7c7a7554", 
+    "revision": "dfa3968a3d5c154e6cbff1333f9d0eb86e02f837", 
     "repo_path": "integration/gaia-central"
 }

From 53230b51bf5f314d1b4be2426e6b1143cc66b55e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 04:16:58 -0700
Subject: [PATCH 26/56] Bumping manifests a=b2g-bump

---
 b2g/config/aries/sources.xml        | 2 +-
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index f865e224766..46cde195f5e 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index c2356bd74f6..87e3533de02 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 4d453d76f9f..fdeca342da9 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="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 7b069f50926..6d096a06b30 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="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 2e8ce007fcb..876f854a2ff 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 560b8019f4d..536bd86985f 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 4d453d76f9f..fdeca342da9 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="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 9bd30706862..f0d1025f535 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index c606bde7fd7..6aa1c2a7304 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index dc613edbc2f..4355fd16433 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4565a2f2104946575e7c0dbdd67e86daa558b022"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 5694051f59265dede3bfc3f8485c8cf1e9ce23d9 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 04:49:31 -0700
Subject: [PATCH 27/56] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/655229371e43
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #31253 from albertopq/1178241-backout

Revert "Bug 1178241 - [vCard] 'undefined' is displayed when a field exist but there's no value in it r=borjasalguero"

========

https://hg.mozilla.org/integration/gaia-central/rev/0a70328f40b3
Author: albertopq <albert.pastor@gmail.com>
Desc: Revert "Bug 1178241 - [vCard] 'undefined' is displayed when a field exist but there's no value in it r=borjasalguero"

This reverts commit c7b6b763144e0303c0709de48d99eb7d760fac12.
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 5b8bfbe915f..a41024bcad8 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "283e40fe02f5a91af4545c23ba90a678822686fb", 
+        "git_revision": "b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "dfa3968a3d5c154e6cbff1333f9d0eb86e02f837", 
+    "revision": "655229371e43fe4ec41dfc49a9af1dd217f21448", 
     "repo_path": "integration/gaia-central"
 }

From 761004de90a7318449aa59da69ec23f91240678a Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 04:49:54 -0700
Subject: [PATCH 28/56] Bumping manifests a=b2g-bump

---
 b2g/config/aries/sources.xml        | 2 +-
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index 46cde195f5e..93bc0fd56b1 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 87e3533de02..bf6f77485c8 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index fdeca342da9..9b636019578 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="283e40fe02f5a91af4545c23ba90a678822686fb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 6d096a06b30..59c1718b300 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="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 876f854a2ff..885e855972f 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 536bd86985f..3b8a2cfbb5c 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index fdeca342da9..9b636019578 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="283e40fe02f5a91af4545c23ba90a678822686fb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index f0d1025f535..375c0cc1d5e 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 6aa1c2a7304..5886d433daf 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 4355fd16433..82af856b793 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="283e40fe02f5a91af4545c23ba90a678822686fb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From af7e32e55a0b80c58230a070e853ed2c53789e71 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 05:27:07 -0700
Subject: [PATCH 29/56] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/686c0d939069
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #31144 from gasolin/issue-1088450

Bug 1088450 - improve Bluetooth transfer messages, r=tim

========

https://hg.mozilla.org/integration/gaia-central/rev/23423888d312
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1088450 - improve Bluetooth transfer messages, r=tim
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index a41024bcad8..36294f86bc1 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c", 
+        "git_revision": "706c70297029531dcf862fd8dcdcc5ddf80961b3", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "655229371e43fe4ec41dfc49a9af1dd217f21448", 
+    "revision": "686c0d939069b261549ecdc75d7b577be0029587", 
     "repo_path": "integration/gaia-central"
 }

From 98bf918d6f6392b1c1138b0ea88f8c00add0b8b4 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 05:28:43 -0700
Subject: [PATCH 30/56] Bumping manifests a=b2g-bump

---
 b2g/config/aries/sources.xml        | 2 +-
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index 93bc0fd56b1..772650b2799 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index bf6f77485c8..0ddcee89dc8 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 9b636019578..f64663e6360 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="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 59c1718b300..687014c0aa7 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="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 885e855972f..7db8eba9020 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 3b8a2cfbb5c..dae0bad072d 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 9b636019578..f64663e6360 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="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 375c0cc1d5e..0ee6325c548 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 5886d433daf..e7e5039e6a3 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 82af856b793..bd06cbb70d5 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b57e9a0b5aee45f80d1ee8bfe69625ab4db20b5c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From fbd0c75a8b3c40a8bf6f71cc3ecf60eda1cab169 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 05:31:56 -0700
Subject: [PATCH 31/56] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/e3a7d67a538d
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #31212 from chenpighead/1189078

Bug 1189078 - Add unregister function to remove event handlers and preference observer for copy/paste. r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/3cccef4b8d9b
Author: Jeremy Chen <jeremychen@mozilla.com>
Desc: Bug 1189078 - Add unregister function to remove event handlers for copy/paste (v3)
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 36294f86bc1..347820a2351 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "706c70297029531dcf862fd8dcdcc5ddf80961b3", 
+        "git_revision": "6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "686c0d939069b261549ecdc75d7b577be0029587", 
+    "revision": "e3a7d67a538d8c992d82c7787a8080f46f1ac73b", 
     "repo_path": "integration/gaia-central"
 }

From 199b6be2f6b33b37dfe715f427a1e979b66ad9e1 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 05:33:34 -0700
Subject: [PATCH 32/56] Bumping manifests a=b2g-bump

---
 b2g/config/aries/sources.xml        | 2 +-
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index 772650b2799..dc1ba94c08f 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 0ddcee89dc8..0b9504f9b9d 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index f64663e6360..772cdfbad72 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="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 687014c0aa7..2c020decaf6 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="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 7db8eba9020..2fe2200a61d 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index dae0bad072d..d0a6e70a930 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index f64663e6360..772cdfbad72 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="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 0ee6325c548..ef4b3cbade1 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index e7e5039e6a3..358bc8a75ad 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index bd06cbb70d5..c3a60b717da 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="706c70297029531dcf862fd8dcdcc5ddf80961b3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From e804f007c02470b6db8da89fc0b781e3d62998f3 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 05:55:36 -0700
Subject: [PATCH 33/56] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/89edada6163b
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Revert "Revert "Revert "Bug 1178241 - [vCard] 'undefined' is displayed when a field exist but there's no value in it r=borjasalguero"""

This reverts commit 148b69dc19a9a26b854675d60808408bc4982e59.

========

https://hg.mozilla.org/integration/gaia-central/rev/05a9ba44627f
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Revert "Revert "Bug 1178241 - [vCard] 'undefined' is displayed when a field exist but there's no value in it r=borjasalguero""

This reverts commit 5afb1cfdfdc9d6c62f5c1d690621ba3d07561e15.
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 347820a2351..d6c216ff05e 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9", 
+        "git_revision": "fa22505e0cb913c170698d7e5cb819e31e5c4d69", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "e3a7d67a538d8c992d82c7787a8080f46f1ac73b", 
+    "revision": "89edada6163bab20c3dc8e61f3e73c88af7e08ae", 
     "repo_path": "integration/gaia-central"
 }

From 01dc89becdd97de947cb90750f574036d142f6b3 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 05:57:17 -0700
Subject: [PATCH 34/56] Bumping manifests a=b2g-bump

---
 b2g/config/aries/sources.xml        | 2 +-
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index dc1ba94c08f..003d3a6c94b 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 0b9504f9b9d..61cb01fb707 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 772cdfbad72..c49026b2157 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="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 2c020decaf6..67ce66d0f9a 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="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 2fe2200a61d..decebed20e9 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index d0a6e70a930..f10c3adda43 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 772cdfbad72..c49026b2157 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="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index ef4b3cbade1..3fcb3b6c6eb 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 358bc8a75ad..4c6803b11db 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index c3a60b717da..bd100b3f4df 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6bccb1e1d4713b4e7e45779a759a8c9a70ffaeb9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 3dad42bc5cbefbc3912f80963e4e7d27cb15f0f1 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 06:25:21 -0700
Subject: [PATCH 35/56] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

========

https://hg.mozilla.org/integration/gaia-central/rev/ceddc4519ffd
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #31134 from yzen/bug-1184806

Bug 1184806 - show correct reset dialog on full dev mode reset vs fac…

========

https://hg.mozilla.org/integration/gaia-central/rev/b08d73f4046f
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1184806 - show correct reset dialog on full dev mode reset vs factory reset. r=gasolin
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index d6c216ff05e..75436ec9871 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "fa22505e0cb913c170698d7e5cb819e31e5c4d69", 
+        "git_revision": "ee75c8b6778f074b2474fa8fd65c4923f1bfebc3", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "89edada6163bab20c3dc8e61f3e73c88af7e08ae", 
+    "revision": "ceddc4519ffd64b48f111fbad927dfdf24d1b598", 
     "repo_path": "integration/gaia-central"
 }

From 0a25fdea8c4a49dde3f47eef6e26ac9583a7848e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 06:26:59 -0700
Subject: [PATCH 36/56] Bumping manifests a=b2g-bump

---
 b2g/config/aries/sources.xml        | 2 +-
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index 003d3a6c94b..a8bad7fd61a 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 61cb01fb707..21f611cb6b3 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index c49026b2157..afd89bacc85 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="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 67ce66d0f9a..8e39db68af8 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="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index decebed20e9..7c15fc447a3 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index f10c3adda43..155e7a690c8 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index c49026b2157..afd89bacc85 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="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 3fcb3b6c6eb..906c5271950 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 4c6803b11db..554c517adf4 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index bd100b3f4df..626f30e7681 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="fa22505e0cb913c170698d7e5cb819e31e5c4d69"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From ef1b5ef89baceec2fbdc85e7e60815f71e97191b Mon Sep 17 00:00:00 2001
From: Martin Tomes <tomesm@gmail.com>
Date: Wed, 5 Aug 2015 14:32:50 +0100
Subject: [PATCH 37/56] Bug 1146312 - Display partner branding and ToS/PN links
 on the GetStarted only. r=Standard8

---
 browser/app/profile/firefox.js                |  2 -
 browser/components/loop/content/js/panel.js   | 82 ++++++-----------
 browser/components/loop/content/js/panel.jsx  | 82 ++++++-----------
 .../loop/content/shared/js/activeRoomStore.js |  3 -
 browser/components/loop/modules/LoopCalls.jsm |  5 --
 .../content/js/standaloneMozLoop.js           |  4 -
 .../loop/test/desktop-local/panel_test.js     | 90 ++++---------------
 .../loop/test/shared/activeRoomStore_test.js  |  8 --
 .../test/standalone/standaloneMozLoop_test.js |  6 --
 .../xpcshell/test_loopservice_notification.js |  8 --
 10 files changed, 71 insertions(+), 219 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 597b3e2b0a7..940a80c0731 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1707,8 +1707,6 @@ pref("image.mem.max_decoded_image_kb", 256000);
 pref("loop.enabled", true);
 pref("loop.textChat.enabled", true);
 pref("loop.server", "https://loop.services.mozilla.com/v0");
-pref("loop.seenToS", "unseen");
-pref("loop.showPartnerLogo", true);
 pref("loop.gettingStarted.seen", false);
 pref("loop.gettingStarted.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/hello/start/");
 pref("loop.gettingStarted.resumeOnFirstJoin", false);
diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index 29da5d251c9..d70d699157d 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -263,16 +263,6 @@ loop.panel = (function(_, mozL10n) {
   var ToSView = React.createClass({displayName: "ToSView",
     mixins: [sharedMixins.WindowCloseMixin],
 
-    getInitialState: function() {
-      var getPref = navigator.mozLoop.getLoopPref.bind(navigator.mozLoop);
-
-      return {
-        seenToS: getPref("seenToS"),
-        gettingStartedSeen: getPref("gettingStarted.seen"),
-        showPartnerLogo: getPref("showPartnerLogo")
-      };
-    },
-
     handleLinkClick: function(event) {
       if (!event.target || !event.target.href) {
         return;
@@ -283,50 +273,35 @@ loop.panel = (function(_, mozL10n) {
       this.closeWindow();
     },
 
-    renderPartnerLogo: function() {
-      if (!this.state.showPartnerLogo) {
-        return null;
-      }
-
-      var locale = mozL10n.getLanguage();
-      navigator.mozLoop.setLoopPref("showPartnerLogo", false);
-      return (
-        React.createElement("p", {className: "powered-by", id: "powered-by"}, 
-          mozL10n.get("powered_by_beforeLogo"), 
-          React.createElement("img", {className: locale, id: "powered-by-logo"}), 
-          mozL10n.get("powered_by_afterLogo")
-        )
-      );
-    },
-
     render: function() {
-      if (!this.state.gettingStartedSeen || this.state.seenToS == "unseen") {
-        var terms_of_use_url = navigator.mozLoop.getLoopPref("legal.ToS_url");
-        var privacy_notice_url = navigator.mozLoop.getLoopPref("legal.privacy_url");
-        var tosHTML = mozL10n.get("legal_text_and_links3", {
-          "clientShortname": mozL10n.get("clientShortname2"),
-          "terms_of_use": React.renderToStaticMarkup(
-            React.createElement("a", {href: terms_of_use_url, target: "_blank"}, 
-              mozL10n.get("legal_text_tos")
-            )
-          ),
-          "privacy_notice": React.renderToStaticMarkup(
-            React.createElement("a", {href: privacy_notice_url, target: "_blank"}, 
-              mozL10n.get("legal_text_privacy")
-            )
+      var locale = mozL10n.getLanguage();
+      var terms_of_use_url = navigator.mozLoop.getLoopPref("legal.ToS_url");
+      var privacy_notice_url = navigator.mozLoop.getLoopPref("legal.privacy_url");
+      var tosHTML = mozL10n.get("legal_text_and_links3", {
+        "clientShortname": mozL10n.get("clientShortname2"),
+        "terms_of_use": React.renderToStaticMarkup(
+          React.createElement("a", {href: terms_of_use_url, target: "_blank"}, 
+            mozL10n.get("legal_text_tos")
           )
-        });
-        return (
-          React.createElement("div", {id: "powered-by-wrapper"}, 
-            this.renderPartnerLogo(), 
-            React.createElement("p", {className: "terms-service", 
-               dangerouslySetInnerHTML: {__html: tosHTML}, 
-               onClick: this.handleLinkClick})
-           )
-        );
-      } else {
-        return React.createElement("div", null);
-      }
+        ),
+        "privacy_notice": React.renderToStaticMarkup(
+          React.createElement("a", {href: privacy_notice_url, target: "_blank"}, 
+            mozL10n.get("legal_text_privacy")
+          )
+        )
+      });
+      return (
+        React.createElement("div", {id: "powered-by-wrapper"}, 
+          React.createElement("p", {className: "powered-by", id: "powered-by"}, 
+            mozL10n.get("powered_by_beforeLogo"), 
+            React.createElement("img", {className: locale, id: "powered-by-logo"}), 
+            mozL10n.get("powered_by_afterLogo")
+          ), 
+          React.createElement("p", {className: "terms-service", 
+             dangerouslySetInnerHTML: {__html: tosHTML}, 
+             onClick: this.handleLinkClick})
+         )
+      );
     }
   });
 
@@ -969,8 +944,7 @@ loop.panel = (function(_, mozL10n) {
               React.createElement(RoomList, {dispatcher: this.props.dispatcher, 
                         mozLoop: this.props.mozLoop, 
                         store: this.props.roomStore, 
-                        userProfile: this.state.userProfile}), 
-              React.createElement(ToSView, null)
+                        userProfile: this.state.userProfile})
             ), 
             React.createElement(Tab, {name: "contacts"}, 
               React.createElement(ContactsList, {
diff --git a/browser/components/loop/content/js/panel.jsx b/browser/components/loop/content/js/panel.jsx
index 759e02a8b8b..579c47a50b9 100644
--- a/browser/components/loop/content/js/panel.jsx
+++ b/browser/components/loop/content/js/panel.jsx
@@ -263,16 +263,6 @@ loop.panel = (function(_, mozL10n) {
   var ToSView = React.createClass({
     mixins: [sharedMixins.WindowCloseMixin],
 
-    getInitialState: function() {
-      var getPref = navigator.mozLoop.getLoopPref.bind(navigator.mozLoop);
-
-      return {
-        seenToS: getPref("seenToS"),
-        gettingStartedSeen: getPref("gettingStarted.seen"),
-        showPartnerLogo: getPref("showPartnerLogo")
-      };
-    },
-
     handleLinkClick: function(event) {
       if (!event.target || !event.target.href) {
         return;
@@ -283,50 +273,35 @@ loop.panel = (function(_, mozL10n) {
       this.closeWindow();
     },
 
-    renderPartnerLogo: function() {
-      if (!this.state.showPartnerLogo) {
-        return null;
-      }
-
-      var locale = mozL10n.getLanguage();
-      navigator.mozLoop.setLoopPref("showPartnerLogo", false);
-      return (
-        <p className="powered-by" id="powered-by">
-          {mozL10n.get("powered_by_beforeLogo")}
-          <img className={locale} id="powered-by-logo" />
-          {mozL10n.get("powered_by_afterLogo")}
-        </p>
-      );
-    },
-
     render: function() {
-      if (!this.state.gettingStartedSeen || this.state.seenToS == "unseen") {
-        var terms_of_use_url = navigator.mozLoop.getLoopPref("legal.ToS_url");
-        var privacy_notice_url = navigator.mozLoop.getLoopPref("legal.privacy_url");
-        var tosHTML = mozL10n.get("legal_text_and_links3", {
-          "clientShortname": mozL10n.get("clientShortname2"),
-          "terms_of_use": React.renderToStaticMarkup(
-            <a href={terms_of_use_url} target="_blank">
-              {mozL10n.get("legal_text_tos")}
-            </a>
-          ),
-          "privacy_notice": React.renderToStaticMarkup(
-            <a href={privacy_notice_url} target="_blank">
-              {mozL10n.get("legal_text_privacy")}
-            </a>
-          )
-        });
-        return (
-          <div id="powered-by-wrapper">
-            {this.renderPartnerLogo()}
-            <p className="terms-service"
-               dangerouslySetInnerHTML={{__html: tosHTML}}
-               onClick={this.handleLinkClick}></p>
-           </div>
-        );
-      } else {
-        return <div />;
-      }
+      var locale = mozL10n.getLanguage();
+      var terms_of_use_url = navigator.mozLoop.getLoopPref("legal.ToS_url");
+      var privacy_notice_url = navigator.mozLoop.getLoopPref("legal.privacy_url");
+      var tosHTML = mozL10n.get("legal_text_and_links3", {
+        "clientShortname": mozL10n.get("clientShortname2"),
+        "terms_of_use": React.renderToStaticMarkup(
+          <a href={terms_of_use_url} target="_blank">
+            {mozL10n.get("legal_text_tos")}
+          </a>
+        ),
+        "privacy_notice": React.renderToStaticMarkup(
+          <a href={privacy_notice_url} target="_blank">
+            {mozL10n.get("legal_text_privacy")}
+          </a>
+        )
+      });
+      return (
+        <div id="powered-by-wrapper">
+          <p className="powered-by" id="powered-by">
+            {mozL10n.get("powered_by_beforeLogo")}
+            <img className={locale} id="powered-by-logo" />
+            {mozL10n.get("powered_by_afterLogo")}
+          </p>
+          <p className="terms-service"
+             dangerouslySetInnerHTML={{__html: tosHTML}}
+             onClick={this.handleLinkClick}></p>
+         </div>
+      );
     }
   });
 
@@ -970,7 +945,6 @@ loop.panel = (function(_, mozL10n) {
                         mozLoop={this.props.mozLoop}
                         store={this.props.roomStore}
                         userProfile={this.state.userProfile} />
-              <ToSView />
             </Tab>
             <Tab name="contacts">
               <ContactsList
diff --git a/browser/components/loop/content/shared/js/activeRoomStore.js b/browser/components/loop/content/shared/js/activeRoomStore.js
index 835c64ee709..d2924385cfd 100644
--- a/browser/components/loop/content/shared/js/activeRoomStore.js
+++ b/browser/components/loop/content/shared/js/activeRoomStore.js
@@ -762,9 +762,6 @@ loop.store.ActiveRoomStore = (function() {
         roomState: ROOM_STATES.HAS_PARTICIPANTS,
         used: true
       });
-
-      // We've connected with a third-party, therefore stop displaying the ToS etc.
-      this._mozLoop.setLoopPref("seenToS", "seen");
     },
 
     /**
diff --git a/browser/components/loop/modules/LoopCalls.jsm b/browser/components/loop/modules/LoopCalls.jsm
index bd8cf63da98..15a3a3ffbaf 100644
--- a/browser/components/loop/modules/LoopCalls.jsm
+++ b/browser/components/loop/modules/LoopCalls.jsm
@@ -210,11 +210,6 @@ let LoopCallsInternal = {
       return;
     }
 
-    // We set this here as it is assumed that once the user receives an incoming
-    // call, they'll have had enough time to see the terms of service. See
-    // bug 1046039 for background.
-    Services.prefs.setCharPref("loop.seenToS", "seen");
-
     // Request the information on the new call(s) associated with this version.
     // The registered FxA session is checked first, then the anonymous session.
     // Make the call to get the GUEST session regardless of whether the FXA
diff --git a/browser/components/loop/standalone/content/js/standaloneMozLoop.js b/browser/components/loop/standalone/content/js/standaloneMozLoop.js
index 49ae826e837..8900f3d0054 100644
--- a/browser/components/loop/standalone/content/js/standaloneMozLoop.js
+++ b/browser/components/loop/standalone/content/js/standaloneMozLoop.js
@@ -270,10 +270,6 @@ loop.StandaloneMozLoop = (function(mozL10n) {
      * @param {String} value The value to set.
      */
     setLoopPref: function(prefName, value) {
-      if (prefName === "seenToS") {
-        return;
-      }
-
       localStorage.setItem(prefName, value);
     },
 
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index 96e0729fd59..4f4d5dd46d2 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -459,22 +459,26 @@ describe("loop.panel", function() {
     });
 
     describe("#render", function() {
-      it("should render a ToSView", function() {
-        var view = createTestPanelView();
-
-        TestUtils.findRenderedComponentWithType(view, loop.panel.ToSView);
-      });
-
-      it("should not render a ToSView when the view has been 'seen'", function() {
+      it("should not render a ToSView when gettingStarted.seen is true", function() {
         navigator.mozLoop.getLoopPref = function() {
-          return "seen";
+          return true;
         };
         var view = createTestPanelView();
 
-        try {
+        expect(function() {
           TestUtils.findRenderedComponentWithType(view, loop.panel.ToSView);
-          sinon.assert.fail("Should not find the ToSView if it has been 'seen'");
-        } catch (ex) {}
+        }).to.Throw(/not find/);
+      });
+
+      it("should not render a ToSView when gettingStarted.seen is false", function() {
+        navigator.mozLoop.getLoopPref = function() {
+          return false;
+        };
+        var view = createTestPanelView();
+
+        expect(function() {
+          TestUtils.findRenderedComponentWithType(view, loop.panel.ToSView);
+        }).to.not.Throw();
       });
 
       it("should render a GettingStarted view", function() {
@@ -989,70 +993,6 @@ describe("loop.panel", function() {
     });
   });
 
-  describe("loop.panel.ToSView", function() {
-
-    it("should render when the value of loop.seenToS is not set", function() {
-      navigator.mozLoop.getLoopPref = function(key) {
-        return {
-          "gettingStarted.seen": true,
-          "seenToS": "unseen"
-        }[key];
-      };
-
-      var view = TestUtils.renderIntoDocument(
-        React.createElement(loop.panel.ToSView));
-
-      TestUtils.findRenderedDOMComponentWithClass(view, "terms-service");
-    });
-
-    it("should not render when the value of loop.seenToS is set to 'seen'", function() {
-        navigator.mozLoop.getLoopPref = function(key) {
-          return {
-            "gettingStarted.seen": true,
-            "seenToS": "seen"
-          }[key];
-        };
-
-        var view = TestUtils.renderIntoDocument(
-          React.createElement(loop.panel.ToSView));
-
-        expect(function() {
-          TestUtils.findRenderedDOMComponentWithClass(view, "terms-service");
-        }).to.Throw(/not find/);
-    });
-
-    it("should render when the value of loop.gettingStarted.seen is false",
-       function() {
-         navigator.mozLoop.getLoopPref = function(key) {
-           return {
-             "gettingStarted.seen": false,
-             "seenToS": "seen"
-           }[key];
-         };
-         var view = TestUtils.renderIntoDocument(
-           React.createElement(loop.panel.ToSView));
-
-         TestUtils.findRenderedDOMComponentWithClass(view, "terms-service");
-       });
-
-    it("should render the telefonica logo after the first time use",
-       function() {
-         navigator.mozLoop.getLoopPref = function(key) {
-           return {
-             "gettingStarted.seen": false,
-             "seenToS": "unseen",
-             "showPartnerLogo": false
-           }[key];
-         };
-
-         var view = TestUtils.renderIntoDocument(
-           React.createElement(loop.panel.ToSView));
-
-         expect(view.getDOMNode().querySelector(".powered-by")).eql(null);
-       });
-
-  });
-
   describe("loop.panel.SignInRequestView", function() {
     var view;
 
diff --git a/browser/components/loop/test/shared/activeRoomStore_test.js b/browser/components/loop/test/shared/activeRoomStore_test.js
index db37d6cc2ee..098af9e59f0 100644
--- a/browser/components/loop/test/shared/activeRoomStore_test.js
+++ b/browser/components/loop/test/shared/activeRoomStore_test.js
@@ -1272,14 +1272,6 @@ describe("loop.store.ActiveRoomStore", function () {
 
       expect(store.getStoreState().roomState).eql(ROOM_STATES.HAS_PARTICIPANTS);
     });
-
-    it("should set the pref for ToS to `seen`", function() {
-      store.remotePeerConnected();
-
-      sinon.assert.calledOnce(fakeMozLoop.setLoopPref);
-      sinon.assert.calledWithExactly(fakeMozLoop.setLoopPref,
-        "seenToS", "seen");
-    });
   });
 
   describe("#remotePeerDisconnected", function() {
diff --git a/browser/components/loop/test/standalone/standaloneMozLoop_test.js b/browser/components/loop/test/standalone/standaloneMozLoop_test.js
index c0f5e276db9..ae9e61743ef 100644
--- a/browser/components/loop/test/standalone/standaloneMozLoop_test.js
+++ b/browser/components/loop/test/standalone/standaloneMozLoop_test.js
@@ -55,12 +55,6 @@ describe("loop.StandaloneMozLoop", function() {
 
       expect(localStorage.getItem("fakePref")).eql("fakeValue");
     });
-
-    it("should not store the value of seenToS", function() {
-      mozLoop.setLoopPref("seenToS", "fakeValue1");
-
-      expect(localStorage.getItem("seenToS")).eql(null);
-    });
   });
 
   describe("#getLoopPref", function() {
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_notification.js b/browser/components/loop/test/xpcshell/test_loopservice_notification.js
index 2e64b652247..803ad66d9bc 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_notification.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_notification.js
@@ -10,8 +10,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "Chat",
 let openChatOrig = Chat.open;
 
 add_test(function test_openChatWindow_on_notification() {
-  Services.prefs.setCharPref("loop.seenToS", "unseen");
-
   mockPushHandler.registrationPushURL = kEndPointUrl;
 
   MozLoopService.promiseRegisteredWithServers(LOOP_SESSION_TYPE.FXA).then(() => {
@@ -25,9 +23,6 @@ add_test(function test_openChatWindow_on_notification() {
     waitForCondition(() => opened).then(() => {
       do_check_true(opened, "should open a chat window");
 
-      do_check_eq(Services.prefs.getCharPref("loop.seenToS"), "seen",
-                  "should set the pref to 'seen'");
-
       run_next_test();
     }, () => {
       do_throw("should have opened a chat window");
@@ -56,9 +51,6 @@ function run_test() {
   do_register_cleanup(function() {
     // Revert original Chat.open implementation
     Chat.open = openChatOrig;
-
-    // clear test pref
-    Services.prefs.clearUserPref("loop.seenToS");
   });
 
   run_next_test();

From 1e58f6dddf64772f940c48b1e0cf1a5ee60a9253 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Wed, 5 Aug 2015 10:38:51 -0400
Subject: [PATCH 38/56] Bug 1007063 - Show virtual (on-screen) keyboard in
 Windows 8 and higher when text fields are focused if physical keyboards are
 not present. r=jimm r=masayuki r=m_kato

---
 modules/libpref/init/all.js      |  12 ++
 toolkit/library/moz.build        |   1 +
 widget/windows/WinIMEHandler.cpp | 292 ++++++++++++++++++++++++++++++-
 widget/windows/WinIMEHandler.h   |  19 ++
 widget/windows/WinUtils.cpp      |   3 +-
 widget/windows/nsLookAndFeel.h   |  20 +++
 6 files changed, 343 insertions(+), 4 deletions(-)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index accf8389f6c..7c72f6712f5 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -3225,6 +3225,18 @@ pref("ui.window_class_override", "");
 // page back/forward actions, or if pinch-to-zoom does not work.
 pref("ui.elantech_gesture_hacks.enabled", -1);
 
+// Show the Windows on-screen keyboard (osk.exe) when a text field is focused.
+#ifdef RELEASE_BUILD
+pref("ui.osk.enabled", false);
+#else
+pref("ui.osk.enabled", true);
+#endif
+// Only show the on-screen keyboard if there are no physical keyboards attached
+// to the device.
+pref("ui.osk.detect_physical_keyboard", true);
+// Path to TabTip.exe on local machine. Cached for performance reasons.
+pref("ui.osk.on_screen_keyboard_path", "");
+
 # XP_WIN
 #endif
 
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index 9e4dcd7dd3d..62e03f45e15 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -18,6 +18,7 @@ def Libxul(name):
     DELAYLOAD_DLLS += [
         'comdlg32.dll',
         'dbghelp.dll',
+        'PowrProf.dll',
         'psapi.dll',
         'rasapi32.dll',
         'rasdlg.dll',
diff --git a/widget/windows/WinIMEHandler.cpp b/widget/windows/WinIMEHandler.cpp
index 695c9d6c54e..78738236428 100644
--- a/widget/windows/WinIMEHandler.cpp
+++ b/widget/windows/WinIMEHandler.cpp
@@ -13,9 +13,20 @@
 #include "TSFTextStore.h"
 #endif // #ifdef NS_ENABLE_TSF
 
+#include "nsLookAndFeel.h"
 #include "nsWindow.h"
 #include "WinUtils.h"
 
+#include "shellapi.h"
+#include "Shlobj.h"
+#include "PowrProf.h"
+#include "Setupapi.h"
+#include "cfgmgr32.h"
+
+const char* kOskPathPrefName = "ui.osk.on_screen_keyboard_path";
+const char* kOskEnabled = "ui.osk.enabled";
+const char* kOskDetectPhysicalKeyboard = "ui.osk.detect_physical_keyboard";
+
 namespace mozilla {
 namespace widget {
 
@@ -27,6 +38,7 @@ namespace widget {
 bool IMEHandler::sIsInTSFMode = false;
 bool IMEHandler::sIsIMMEnabled = true;
 bool IMEHandler::sPluginHasFocus = false;
+bool IMEHandler::sShowingOnScreenKeyboard = false;
 decltype(SetInputScopes)* IMEHandler::sSetInputScopes = nullptr;
 #endif // #ifdef NS_ENABLE_TSF
 
@@ -197,11 +209,16 @@ IMEHandler::NotifyIME(nsWindow* aWindow,
         return NS_OK;
       case NOTIFY_IME_OF_TEXT_CHANGE:
         return TSFTextStore::OnTextChange(aIMENotification);
-      case NOTIFY_IME_OF_FOCUS:
+      case NOTIFY_IME_OF_FOCUS: {
         IMMHandler::OnFocusChange(true, aWindow);
-        return TSFTextStore::OnFocusChange(true, aWindow,
-                                           aWindow->GetInputContext());
+        nsresult rv =
+          TSFTextStore::OnFocusChange(true, aWindow,
+                                      aWindow->GetInputContext());
+        IMEHandler::MaybeShowOnScreenKeyboard();
+        return rv;
+      }
       case NOTIFY_IME_OF_BLUR:
+        IMEHandler::MaybeDismissOnScreenKeyboard();
         IMMHandler::OnFocusChange(false, aWindow);
         return TSFTextStore::OnFocusChange(false, aWindow,
                                            aWindow->GetInputContext());
@@ -251,8 +268,10 @@ IMEHandler::NotifyIME(nsWindow* aWindow,
       return IMMHandler::OnMouseButtonEvent(aWindow, aIMENotification);
     case NOTIFY_IME_OF_FOCUS:
       IMMHandler::OnFocusChange(true, aWindow);
+      IMEHandler::MaybeShowOnScreenKeyboard();
       return NS_OK;
     case NOTIFY_IME_OF_BLUR:
+      IMEHandler::MaybeDismissOnScreenKeyboard();
       IMMHandler::OnFocusChange(false, aWindow);
 #ifdef NS_ENABLE_TSF
       // If a plugin gets focus while TSF has focus, we need to notify TSF of
@@ -502,5 +521,272 @@ IMEHandler::SetInputScopeForIMM32(nsWindow* aWindow,
   }
 }
 
+// static
+void
+IMEHandler::MaybeShowOnScreenKeyboard()
+{
+  if (sPluginHasFocus) {
+    return;
+  }
+  IMEHandler::ShowOnScreenKeyboard();
+}
+
+// static
+void
+IMEHandler::MaybeDismissOnScreenKeyboard()
+{
+  if (sPluginHasFocus) {
+    return;
+  }
+  IMEHandler::DismissOnScreenKeyboard();
+}
+
+// static
+bool
+IMEHandler::WStringStartsWithCaseInsensitive(const std::wstring& aHaystack,
+                                             const std::wstring& aNeedle)
+{
+  std::wstring lowerCaseHaystack(aHaystack);
+  std::wstring lowerCaseNeedle(aNeedle);
+  std::transform(lowerCaseHaystack.begin(), lowerCaseHaystack.end(),
+                 lowerCaseHaystack.begin(), ::tolower);
+  std::transform(lowerCaseNeedle.begin(), lowerCaseNeedle.end(),
+                 lowerCaseNeedle.begin(), ::tolower);
+  return wcsstr(lowerCaseHaystack.c_str(),
+                lowerCaseNeedle.c_str()) == lowerCaseHaystack.c_str();
+}
+
+// Returns true if a physical keyboard is detected on Windows 8 and up.
+// Uses the Setup APIs to enumerate the attached keyboards and returns true
+// if the keyboard count is 1 or more. While this will work in most cases
+// it won't work if there are devices which expose keyboard interfaces which
+// are attached to the machine.
+// Based on IsKeyboardPresentOnSlate() in Chromium's base/win/win_util.cc.
+// static
+bool
+IMEHandler::IsKeyboardPresentOnSlate()
+{
+  // This function is only supported for Windows 8 and up.
+  if (!IsWin8OrLater()) {
+    return true;
+  }
+
+  if (!Preferences::GetBool(kOskDetectPhysicalKeyboard, true)) {
+    // Detection for physical keyboard has been disabled for testing.
+    return false;
+  }
+
+  // This function should be only invoked for machines with touch screens.
+  if ((::GetSystemMetrics(SM_DIGITIZER) & NID_INTEGRATED_TOUCH)
+        != NID_INTEGRATED_TOUCH) {
+    return true;
+  }
+
+  // If the device is docked, the user is treating the device as a PC.
+  if (::GetSystemMetrics(SM_SYSTEMDOCKED) != 0) {
+    return true;
+  }
+
+  // To determine whether a keyboard is present on the device, we do the
+  // following:-
+  // 1. Check whether the device supports auto rotation. If it does then
+  //    it possibly supports flipping from laptop to slate mode. If it
+  //    does not support auto rotation, then we assume it is a desktop
+  //    or a normal laptop and assume that there is a keyboard.
+
+  // 2. If the device supports auto rotation, then we get its platform role
+  //    and check the system metric SM_CONVERTIBLESLATEMODE to see if it is
+  //    being used in slate mode. If yes then we return false here to ensure
+  //    that the OSK is displayed.
+
+  // 3. If step 1 and 2 fail then we check attached keyboards and return true
+  //    if we find ACPI\* or HID\VID* keyboards.
+
+  typedef BOOL (WINAPI* GetAutoRotationState)(PAR_STATE state);
+  GetAutoRotationState get_rotation_state =
+    reinterpret_cast<GetAutoRotationState>(::GetProcAddress(
+      ::GetModuleHandleW(L"user32.dll"), "GetAutoRotationState"));
+
+  if (get_rotation_state) {
+    AR_STATE auto_rotation_state = AR_ENABLED;
+    get_rotation_state(&auto_rotation_state);
+    if ((auto_rotation_state & AR_NOSENSOR) ||
+        (auto_rotation_state & AR_NOT_SUPPORTED)) {
+      // If there is no auto rotation sensor or rotation is not supported in
+      // the current configuration, then we can assume that this is a desktop
+      // or a traditional laptop.
+      return true;
+    }
+  }
+
+  // Check if the device is being used as a laptop or a tablet. This can be
+  // checked by first checking the role of the device and then the
+  // corresponding system metric (SM_CONVERTIBLESLATEMODE). If it is being
+  // used as a tablet then we want the OSK to show up.
+  typedef POWER_PLATFORM_ROLE (WINAPI* PowerDeterminePlatformRole)();
+  PowerDeterminePlatformRole power_determine_platform_role =
+    reinterpret_cast<PowerDeterminePlatformRole>(::GetProcAddress(
+      ::LoadLibraryW(L"PowrProf.dll"), "PowerDeterminePlatformRole"));
+  if (power_determine_platform_role) {
+    POWER_PLATFORM_ROLE role = power_determine_platform_role();
+    if (((role == PlatformRoleMobile) || (role == PlatformRoleSlate)) &&
+         (::GetSystemMetrics(SM_CONVERTIBLESLATEMODE) == 0)) {
+      return false;
+    }
+  }
+
+  const GUID KEYBOARD_CLASS_GUID =
+    { 0x4D36E96B, 0xE325,  0x11CE,
+      { 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18 } };
+
+  bool result = false;
+  // Query for all the keyboard devices.
+  HDEVINFO device_info =
+    ::SetupDiGetClassDevs(&KEYBOARD_CLASS_GUID, nullptr,
+                          nullptr, DIGCF_PRESENT);
+  if (device_info == INVALID_HANDLE_VALUE) {
+    return result;
+  }
+
+  // Enumerate all keyboards and look for ACPI\PNP and HID\VID devices. If
+  // the count is more than 1 we assume that a keyboard is present. This is
+  // under the assumption that there will always be one keyboard device.
+  for (DWORD i = 0;; ++i) {
+    SP_DEVINFO_DATA device_info_data = { 0 };
+    device_info_data.cbSize = sizeof(device_info_data);
+    if (!::SetupDiEnumDeviceInfo(device_info, i, &device_info_data)) {
+      break;
+    }
+
+    // Get the device ID.
+    wchar_t device_id[MAX_DEVICE_ID_LEN];
+    CONFIGRET status = ::CM_Get_Device_ID(device_info_data.DevInst,
+                                          device_id,
+                                          MAX_DEVICE_ID_LEN,
+                                          0);
+    if (status == CR_SUCCESS) {
+      // To reduce the scope of the hack we only look for ACPI and HID\\VID
+      // prefixes in the keyboard device ids.
+      if (IMEHandler::WStringStartsWithCaseInsensitive(device_id,
+                                                       L"ACPI") ||
+          IMEHandler::WStringStartsWithCaseInsensitive(device_id,
+                                                       L"HID\\VID")) {
+        // The heuristic we are using is to check the count of keyboards and
+        // return true if the API's report one or more keyboards. Please note
+        // that this will break for non keyboard devices which expose a
+        // keyboard PDO.
+        result = true;
+      }
+    }
+  }
+  return result;
+}
+
+// Based on DisplayVirtualKeyboard() in Chromium's base/win/win_util.cc.
+// static
+void
+IMEHandler::ShowOnScreenKeyboard()
+{
+  if (!IsWin8OrLater() ||
+      !Preferences::GetBool(kOskEnabled, true) ||
+      sShowingOnScreenKeyboard ||
+      IMEHandler::IsKeyboardPresentOnSlate()) {
+    return;
+  }
+
+  nsAutoString cachedPath;
+  nsresult result = Preferences::GetString(kOskPathPrefName, &cachedPath);
+  if (NS_FAILED(result) || cachedPath.IsEmpty()) {
+    wchar_t path[MAX_PATH];
+    // The path to TabTip.exe is defined at the following registry key.
+    // This is pulled out of the 64-bit registry hive directly.
+    const wchar_t kRegKeyName[] =
+      L"Software\\Classes\\CLSID\\"
+      L"{054AAE20-4BEA-4347-8A35-64A533254A9D}\\LocalServer32";
+    if (!WinUtils::GetRegistryKey(HKEY_LOCAL_MACHINE,
+                                  kRegKeyName,
+                                  0,
+                                  path,
+                                  sizeof path)) {
+      return;
+    }
+
+    std::wstring wstrpath(path);
+    // The path provided by the registry will often contain
+    // %CommonProgramFiles%, which will need to be replaced if it is present.
+    size_t commonProgramFilesOffset = wstrpath.find(L"%CommonProgramFiles%");
+    if (commonProgramFilesOffset != std::wstring::npos) {
+      // The path read from the registry contains the %CommonProgramFiles%
+      // environment variable prefix. On 64 bit Windows the
+      // SHGetKnownFolderPath function returns the common program files path
+      // with the X86 suffix for the FOLDERID_ProgramFilesCommon value.
+      // To get the correct path to TabTip.exe we first read the environment
+      // variable CommonProgramW6432 which points to the desired common
+      // files path. Failing that we fallback to the SHGetKnownFolderPath API.
+
+      // We then replace the %CommonProgramFiles% value with the actual common
+      // files path found in the process.
+      std::wstring commonProgramFilesPath;
+      std::vector<wchar_t> commonProgramFilesPathW6432;
+      DWORD bufferSize = ::GetEnvironmentVariableW(L"CommonProgramW6432",
+                                                   nullptr, 0);
+      if (bufferSize) {
+        commonProgramFilesPathW6432.resize(bufferSize);
+        ::GetEnvironmentVariableW(L"CommonProgramW6432",
+                                  commonProgramFilesPathW6432.data(),
+                                  bufferSize);
+        commonProgramFilesPath =
+          std::wstring(commonProgramFilesPathW6432.data());
+      } else {
+        PWSTR path = nullptr;
+        HRESULT hres = ::SHGetKnownFolderPath(FOLDERID_ProgramFilesCommon, 0,
+                                              nullptr, &path);
+        if (FAILED(hres) || !path) {
+          return;
+        }
+        commonProgramFilesPath = nsDependentString(path).get();
+        ::CoTaskMemFree(path);
+      }
+      wstrpath.replace(commonProgramFilesOffset,
+                       wcslen(L"%CommonProgramFiles%"),
+                       commonProgramFilesPath);
+    }
+
+    cachedPath.Assign(wstrpath.data());
+    Preferences::SetString(kOskPathPrefName, cachedPath);
+  }
+
+  LPCWSTR cachedPathPtr;
+  cachedPath.GetData(&cachedPathPtr);
+  HINSTANCE ret = ::ShellExecuteW(nullptr,
+                                  L"",
+                                  cachedPathPtr,
+                                  nullptr,
+                                  nullptr,
+                                  SW_SHOW);
+  sShowingOnScreenKeyboard = true;
+}
+
+// Based on DismissVirtualKeyboard() in Chromium's base/win/win_util.cc.
+// static
+void
+IMEHandler::DismissOnScreenKeyboard()
+{
+  if (!IsWin8OrLater() ||
+      !sShowingOnScreenKeyboard) {
+    return;
+  }
+
+  sShowingOnScreenKeyboard = false;
+
+  // Dismiss the virtual keyboard by generating the ESC keystroke
+  // programmatically.
+  const wchar_t kOSKClassName[] = L"IPTip_Main_Window";
+  HWND osk = ::FindWindowW(kOSKClassName, nullptr);
+  if (::IsWindow(osk) && ::IsWindowEnabled(osk)) {
+    ::PostMessage(osk, WM_SYSCOMMAND, SC_CLOSE, 0);
+  }
+}
+
 } // namespace widget
 } // namespace mozilla
diff --git a/widget/windows/WinIMEHandler.h b/widget/windows/WinIMEHandler.h
index c859aafa62c..3f0199e3da6 100644
--- a/widget/windows/WinIMEHandler.h
+++ b/widget/windows/WinIMEHandler.h
@@ -120,9 +120,28 @@ private:
   // Additionally, IME context is always disassociated from focused window.
   static bool sIsIMMEnabled;
   static bool sPluginHasFocus;
+  static bool sShowingOnScreenKeyboard;
 
   static bool IsTSFAvailable() { return (sIsInTSFMode && !sPluginHasFocus); }
   static bool IsIMMActive();
+
+  static void MaybeShowOnScreenKeyboard();
+  static void MaybeDismissOnScreenKeyboard();
+  static bool WStringStartsWithCaseInsensitive(const std::wstring& aHaystack,
+                                               const std::wstring& aNeedle);
+  static bool IsKeyboardPresentOnSlate();
+
+  /**
+   * Show the Windows on-screen keyboard. Only allowed for
+   * chrome documents and Windows 8 and higher.
+   */
+  static void ShowOnScreenKeyboard();
+
+  /**
+   * Dismiss the Windows on-screen keyboard. Only allowed for
+   * Windows 8 and higher.
+   */
+  static void DismissOnScreenKeyboard();
 #endif // #ifdef NS_ENABLE_TSF
 };
 
diff --git a/widget/windows/WinUtils.cpp b/widget/windows/WinUtils.cpp
index 7d70f743172..aa3e19f7bd1 100644
--- a/widget/windows/WinUtils.cpp
+++ b/widget/windows/WinUtils.cpp
@@ -670,7 +670,8 @@ WinUtils::GetRegistryKey(HKEY aRoot,
     ::RegQueryValueExW(key, aValueName, nullptr, &type, (BYTE*) aBuffer,
                        &aBufferLength);
   ::RegCloseKey(key);
-  if (result != ERROR_SUCCESS || type != REG_SZ) {
+  if (result != ERROR_SUCCESS ||
+      (type != REG_SZ && type != REG_EXPAND_SZ)) {
     return false;
   }
   if (aBuffer) {
diff --git a/widget/windows/nsLookAndFeel.h b/widget/windows/nsLookAndFeel.h
index f83dcb8281b..aca794b7e95 100644
--- a/widget/windows/nsLookAndFeel.h
+++ b/widget/windows/nsLookAndFeel.h
@@ -21,6 +21,26 @@
 #define NID_READY            0x00000080
 #endif
 
+/*
+ * Tablet mode detection
+ */
+#ifndef SM_SYSTEMDOCKED
+#define SM_CONVERTIBLESLATEMODE 0x00002003
+#define SM_SYSTEMDOCKED         0x00002004
+typedef enum _AR_STATE
+{
+  AR_ENABLED        = 0x0,
+  AR_DISABLED       = 0x1,
+  AR_SUPPRESSED     = 0x2,
+  AR_REMOTESESSION  = 0x4,
+  AR_MULTIMON       = 0x8,
+  AR_NOSENSOR       = 0x10,
+  AR_NOT_SUPPORTED  = 0x20,
+  AR_DOCKED         = 0x40,
+  AR_LAPTOP         = 0x80
+} AR_STATE, *PAR_STATE;
+#endif
+
 class nsLookAndFeel: public nsXPLookAndFeel {
   static OperatingSystemVersion GetOperatingSystemVersion();
 public:

From b0cf02472c8bd84c206ab290b178ccd8517407c8 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 07:55:29 -0700
Subject: [PATCH 39/56] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/8c6bb2148473
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #31249 from gasolin/issue-1171385

Bug 1171385 - [Settings][l10n] 'Service workers' is hard-coded, r=yzen

========

https://hg.mozilla.org/integration/gaia-central/rev/09fc5b74f486
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1171385 - [Settings][l10n] 'Service workers' is hard-coded, r=yzen
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 75436ec9871..69a6daf164e 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "ee75c8b6778f074b2474fa8fd65c4923f1bfebc3", 
+        "git_revision": "500afda8ce5c99bc18afe100966ba0b256f8d869", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "ceddc4519ffd64b48f111fbad927dfdf24d1b598", 
+    "revision": "8c6bb2148473d2613fb4cc61749d029154134c45", 
     "repo_path": "integration/gaia-central"
 }

From 567ddf0dae140a832bee92667891398069950105 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 07:57:07 -0700
Subject: [PATCH 40/56] Bumping manifests a=b2g-bump

---
 b2g/config/aries/sources.xml        | 2 +-
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index a8bad7fd61a..d9265f25b4e 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 21f611cb6b3..4a89ca05a68 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index afd89bacc85..07abfc665d5 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="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 8e39db68af8..9d21c99c110 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="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 7c15fc447a3..8fd65d3b0ec 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 155e7a690c8..0d8acf84b20 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index afd89bacc85..07abfc665d5 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="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 906c5271950..b369adb2439 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 554c517adf4..a48ea5b95b0 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 626f30e7681..0b4f55cffc5 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ee75c8b6778f074b2474fa8fd65c4923f1bfebc3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From b88feef98690e6ed5d53bbe34ea5f398d5e6ba5d Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Wed, 5 Aug 2015 16:57:20 +0200
Subject: [PATCH 41/56] Backed out changeset 7f106466e9ad (bug 1185579) for
 memory leaks on a CLOSED TREE

---
 browser/components/uitour/UITour.jsm          |  9 ---
 browser/components/uitour/test/browser.ini    |  2 -
 browser/components/uitour/test/browser_fxa.js | 68 -------------------
 browser/components/uitour/test/head.js        |  6 --
 4 files changed, 85 deletions(-)
 delete mode 100644 browser/components/uitour/test/browser_fxa.js

diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm
index 9c143ff1a8a..19d804deb40 100644
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@@ -98,20 +98,11 @@ this.UITour = {
   targets: new Map([
     ["accountStatus", {
       query: (aDocument) => {
-        // If the user is logged in, use the avatar element.
-        let fxAFooter = aDocument.getElementById("PanelUI-footer-fxa");
-        if (fxAFooter.getAttribute("fxastatus")) {
-          return aDocument.getElementById("PanelUI-fxa-avatar");
-        }
-
-        // Otherwise use the sync setup icon.
         let statusButton = aDocument.getElementById("PanelUI-fxa-label");
         return aDocument.getAnonymousElementByAttribute(statusButton,
                                                         "class",
                                                         "toolbarbutton-icon");
       },
-      // This is a fake widgetName starting with the "PanelUI-" prefix so we know
-      // to automatically open the appMenu when annotating this target.
       widgetName: "PanelUI-fxa-label",
     }],
     ["addons",      {query: "#add-ons-button"}],
diff --git a/browser/components/uitour/test/browser.ini b/browser/components/uitour/test/browser.ini
index 056ff98be22..cb3d5fc4e27 100644
--- a/browser/components/uitour/test/browser.ini
+++ b/browser/components/uitour/test/browser.ini
@@ -7,8 +7,6 @@ support-files =
 
 [browser_backgroundTab.js]
 skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly
-[browser_fxa.js]
-skip-if = e10s # Bug 1073247 - UITour tests not e10s friendly
 [browser_no_tabs.js]
 [browser_openPreferences.js]
 skip-if = e10s # Bug 1073247 - UITour tests not e10s friendly
diff --git a/browser/components/uitour/test/browser_fxa.js b/browser/components/uitour/test/browser_fxa.js
deleted file mode 100644
index 802c747d6b0..00000000000
--- a/browser/components/uitour/test/browser_fxa.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
-
-XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts",
-                                  "resource://gre/modules/FxAccounts.jsm");
-
-let gTestTab;
-let gContentAPI;
-let gContentWindow;
-
-function test() {
-  UITourTest();
-}
-
-registerCleanupFunction(function*() {
-  yield signOut();
-  gFxAccounts.updateAppMenuItem();
-});
-
-let tests = [
-  taskify(function* test_highlight_accountStatus_loggedOut() {
-    let userData = yield fxAccounts.getSignedInUser();
-    is(userData, null, "Not logged in initially");
-    yield showMenuPromise("appMenu");
-    yield showHighlightPromise("accountStatus");
-    let highlight = document.getElementById("UITourHighlightContainer");
-    is(highlight.getAttribute("targetName"), "accountStatus", "Correct highlight target");
-  }),
-
-  taskify(function* test_highlight_accountStatus_loggedIn() {
-    yield setSignedInUser();
-    let userData = yield fxAccounts.getSignedInUser();
-    isnot(userData, null, "Logged in now");
-    gFxAccounts.updateAppMenuItem();
-    yield showMenuPromise("appMenu");
-    yield showHighlightPromise("accountStatus");
-    let highlight = document.getElementById("UITourHighlightContainer");
-    is(highlight.popupBoxObject.anchorNode.id, "PanelUI-fxa-avatar", "Anchored on avatar");
-    is(highlight.getAttribute("targetName"), "accountStatus", "Correct highlight target");
-  }),
-];
-
-// Helpers copied from browser_aboutAccounts.js
-// watch out - these will fire observers which if you aren't careful, may
-// interfere with the tests.
-function setSignedInUser(data) {
-  if (!data) {
-    data = {
-      email: "foo@example.com",
-      uid: "1234@lcip.org",
-      assertion: "foobar",
-      sessionToken: "dead",
-      kA: "beef",
-      kB: "cafe",
-      verified: true
-    };
-  }
- return fxAccounts.setSignedInUser(data);
-}
-
-function signOut() {
-  // we always want a "localOnly" signout here...
-  return fxAccounts.signOut(true);
-}
diff --git a/browser/components/uitour/test/head.js b/browser/components/uitour/test/head.js
index 81161a0343e..4ebe214beda 100644
--- a/browser/components/uitour/test/head.js
+++ b/browser/components/uitour/test/head.js
@@ -139,12 +139,6 @@ function showInfoPromise(...args) {
   return promisePanelElementShown(window, popup);
 }
 
-function showHighlightPromise(...args) {
-  let popup = document.getElementById("UITourHighlightContainer");
-  gContentAPI.showHighlight.apply(gContentAPI, args);
-  return promisePanelElementShown(window, popup);
-}
-
 function showMenuPromise(name) {
   return new Promise(resolve => {
     gContentAPI.showMenu(name, () => resolve());

From 15678c1f433f544d27a1282b365ee939cb496295 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 08:52:02 -0700
Subject: [PATCH 42/56] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/91ff0f7b8323
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #31247 from dwi2/bug1186301_reland

Bug 1186301 - [Stingray] Scanning and display BT devices in Device Deck

========

https://hg.mozilla.org/integration/gaia-central/rev/dda711979bb2
Author: Tzu-Lin Huang <tzhuang@mozilla.com>
Desc: Bug 1186301 - [Stingray] Scanning and display BT devices in Device Deck

========

https://hg.mozilla.org/integration/gaia-central/rev/683de3122e8f
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #31232 from albertopq/fix-privacy-test

Bug 1139735 - Fixing GU13 perma fail

========

https://hg.mozilla.org/integration/gaia-central/rev/df043aea84d5
Author: albertopq <albert.pastor@gmail.com>
Desc: Fixing GU13 perma fail

========

https://hg.mozilla.org/integration/gaia-central/rev/078fc2464f50
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #31165 from etiennesegonzac/bug-1189103

Bug 1189103 - Remove the svg shadows in the CardView r=sfoster

========

https://hg.mozilla.org/integration/gaia-central/rev/a4394887e028
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 1189103 - Remove the svg shadows in the CardView r=sfoster
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 69a6daf164e..044beea2eca 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "500afda8ce5c99bc18afe100966ba0b256f8d869", 
+        "git_revision": "2905411032bc2ba80a73c43794453963782db607", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "8c6bb2148473d2613fb4cc61749d029154134c45", 
+    "revision": "91ff0f7b832332454f4fb288b6ce906955b9e20e", 
     "repo_path": "integration/gaia-central"
 }

From cf4bad768b3a9a37d56115c6c458e9d3298110fd Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 08:53:41 -0700
Subject: [PATCH 43/56] Bumping manifests a=b2g-bump

---
 b2g/config/aries/sources.xml        | 2 +-
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index d9265f25b4e..bde4c35ac98 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 4a89ca05a68..b53fe8efed0 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 07abfc665d5..b795bf8ac86 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="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 9d21c99c110..a5a49a685ee 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="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 8fd65d3b0ec..20034745dbd 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 0d8acf84b20..85ae667d1aa 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 07abfc665d5..b795bf8ac86 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="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index b369adb2439..73d7caaa3fb 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index a48ea5b95b0..9ac75af5f36 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 0b4f55cffc5..a4338ad792b 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="500afda8ce5c99bc18afe100966ba0b256f8d869"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 17e7d0a8c5c979583815db448653f7017ab63800 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 5 Aug 2015 12:20:17 -0400
Subject: [PATCH 44/56] Backed out changeset 621a6c6aa375 (bug 1007063) for
 Windows XP test failures/crashes. CLOSED TREE

---
 modules/libpref/init/all.js      |  12 --
 toolkit/library/moz.build        |   1 -
 widget/windows/WinIMEHandler.cpp | 292 +------------------------------
 widget/windows/WinIMEHandler.h   |  19 --
 widget/windows/WinUtils.cpp      |   3 +-
 widget/windows/nsLookAndFeel.h   |  20 ---
 6 files changed, 4 insertions(+), 343 deletions(-)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 7c72f6712f5..accf8389f6c 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -3225,18 +3225,6 @@ pref("ui.window_class_override", "");
 // page back/forward actions, or if pinch-to-zoom does not work.
 pref("ui.elantech_gesture_hacks.enabled", -1);
 
-// Show the Windows on-screen keyboard (osk.exe) when a text field is focused.
-#ifdef RELEASE_BUILD
-pref("ui.osk.enabled", false);
-#else
-pref("ui.osk.enabled", true);
-#endif
-// Only show the on-screen keyboard if there are no physical keyboards attached
-// to the device.
-pref("ui.osk.detect_physical_keyboard", true);
-// Path to TabTip.exe on local machine. Cached for performance reasons.
-pref("ui.osk.on_screen_keyboard_path", "");
-
 # XP_WIN
 #endif
 
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index 62e03f45e15..9e4dcd7dd3d 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -18,7 +18,6 @@ def Libxul(name):
     DELAYLOAD_DLLS += [
         'comdlg32.dll',
         'dbghelp.dll',
-        'PowrProf.dll',
         'psapi.dll',
         'rasapi32.dll',
         'rasdlg.dll',
diff --git a/widget/windows/WinIMEHandler.cpp b/widget/windows/WinIMEHandler.cpp
index 78738236428..695c9d6c54e 100644
--- a/widget/windows/WinIMEHandler.cpp
+++ b/widget/windows/WinIMEHandler.cpp
@@ -13,20 +13,9 @@
 #include "TSFTextStore.h"
 #endif // #ifdef NS_ENABLE_TSF
 
-#include "nsLookAndFeel.h"
 #include "nsWindow.h"
 #include "WinUtils.h"
 
-#include "shellapi.h"
-#include "Shlobj.h"
-#include "PowrProf.h"
-#include "Setupapi.h"
-#include "cfgmgr32.h"
-
-const char* kOskPathPrefName = "ui.osk.on_screen_keyboard_path";
-const char* kOskEnabled = "ui.osk.enabled";
-const char* kOskDetectPhysicalKeyboard = "ui.osk.detect_physical_keyboard";
-
 namespace mozilla {
 namespace widget {
 
@@ -38,7 +27,6 @@ namespace widget {
 bool IMEHandler::sIsInTSFMode = false;
 bool IMEHandler::sIsIMMEnabled = true;
 bool IMEHandler::sPluginHasFocus = false;
-bool IMEHandler::sShowingOnScreenKeyboard = false;
 decltype(SetInputScopes)* IMEHandler::sSetInputScopes = nullptr;
 #endif // #ifdef NS_ENABLE_TSF
 
@@ -209,16 +197,11 @@ IMEHandler::NotifyIME(nsWindow* aWindow,
         return NS_OK;
       case NOTIFY_IME_OF_TEXT_CHANGE:
         return TSFTextStore::OnTextChange(aIMENotification);
-      case NOTIFY_IME_OF_FOCUS: {
+      case NOTIFY_IME_OF_FOCUS:
         IMMHandler::OnFocusChange(true, aWindow);
-        nsresult rv =
-          TSFTextStore::OnFocusChange(true, aWindow,
-                                      aWindow->GetInputContext());
-        IMEHandler::MaybeShowOnScreenKeyboard();
-        return rv;
-      }
+        return TSFTextStore::OnFocusChange(true, aWindow,
+                                           aWindow->GetInputContext());
       case NOTIFY_IME_OF_BLUR:
-        IMEHandler::MaybeDismissOnScreenKeyboard();
         IMMHandler::OnFocusChange(false, aWindow);
         return TSFTextStore::OnFocusChange(false, aWindow,
                                            aWindow->GetInputContext());
@@ -268,10 +251,8 @@ IMEHandler::NotifyIME(nsWindow* aWindow,
       return IMMHandler::OnMouseButtonEvent(aWindow, aIMENotification);
     case NOTIFY_IME_OF_FOCUS:
       IMMHandler::OnFocusChange(true, aWindow);
-      IMEHandler::MaybeShowOnScreenKeyboard();
       return NS_OK;
     case NOTIFY_IME_OF_BLUR:
-      IMEHandler::MaybeDismissOnScreenKeyboard();
       IMMHandler::OnFocusChange(false, aWindow);
 #ifdef NS_ENABLE_TSF
       // If a plugin gets focus while TSF has focus, we need to notify TSF of
@@ -521,272 +502,5 @@ IMEHandler::SetInputScopeForIMM32(nsWindow* aWindow,
   }
 }
 
-// static
-void
-IMEHandler::MaybeShowOnScreenKeyboard()
-{
-  if (sPluginHasFocus) {
-    return;
-  }
-  IMEHandler::ShowOnScreenKeyboard();
-}
-
-// static
-void
-IMEHandler::MaybeDismissOnScreenKeyboard()
-{
-  if (sPluginHasFocus) {
-    return;
-  }
-  IMEHandler::DismissOnScreenKeyboard();
-}
-
-// static
-bool
-IMEHandler::WStringStartsWithCaseInsensitive(const std::wstring& aHaystack,
-                                             const std::wstring& aNeedle)
-{
-  std::wstring lowerCaseHaystack(aHaystack);
-  std::wstring lowerCaseNeedle(aNeedle);
-  std::transform(lowerCaseHaystack.begin(), lowerCaseHaystack.end(),
-                 lowerCaseHaystack.begin(), ::tolower);
-  std::transform(lowerCaseNeedle.begin(), lowerCaseNeedle.end(),
-                 lowerCaseNeedle.begin(), ::tolower);
-  return wcsstr(lowerCaseHaystack.c_str(),
-                lowerCaseNeedle.c_str()) == lowerCaseHaystack.c_str();
-}
-
-// Returns true if a physical keyboard is detected on Windows 8 and up.
-// Uses the Setup APIs to enumerate the attached keyboards and returns true
-// if the keyboard count is 1 or more. While this will work in most cases
-// it won't work if there are devices which expose keyboard interfaces which
-// are attached to the machine.
-// Based on IsKeyboardPresentOnSlate() in Chromium's base/win/win_util.cc.
-// static
-bool
-IMEHandler::IsKeyboardPresentOnSlate()
-{
-  // This function is only supported for Windows 8 and up.
-  if (!IsWin8OrLater()) {
-    return true;
-  }
-
-  if (!Preferences::GetBool(kOskDetectPhysicalKeyboard, true)) {
-    // Detection for physical keyboard has been disabled for testing.
-    return false;
-  }
-
-  // This function should be only invoked for machines with touch screens.
-  if ((::GetSystemMetrics(SM_DIGITIZER) & NID_INTEGRATED_TOUCH)
-        != NID_INTEGRATED_TOUCH) {
-    return true;
-  }
-
-  // If the device is docked, the user is treating the device as a PC.
-  if (::GetSystemMetrics(SM_SYSTEMDOCKED) != 0) {
-    return true;
-  }
-
-  // To determine whether a keyboard is present on the device, we do the
-  // following:-
-  // 1. Check whether the device supports auto rotation. If it does then
-  //    it possibly supports flipping from laptop to slate mode. If it
-  //    does not support auto rotation, then we assume it is a desktop
-  //    or a normal laptop and assume that there is a keyboard.
-
-  // 2. If the device supports auto rotation, then we get its platform role
-  //    and check the system metric SM_CONVERTIBLESLATEMODE to see if it is
-  //    being used in slate mode. If yes then we return false here to ensure
-  //    that the OSK is displayed.
-
-  // 3. If step 1 and 2 fail then we check attached keyboards and return true
-  //    if we find ACPI\* or HID\VID* keyboards.
-
-  typedef BOOL (WINAPI* GetAutoRotationState)(PAR_STATE state);
-  GetAutoRotationState get_rotation_state =
-    reinterpret_cast<GetAutoRotationState>(::GetProcAddress(
-      ::GetModuleHandleW(L"user32.dll"), "GetAutoRotationState"));
-
-  if (get_rotation_state) {
-    AR_STATE auto_rotation_state = AR_ENABLED;
-    get_rotation_state(&auto_rotation_state);
-    if ((auto_rotation_state & AR_NOSENSOR) ||
-        (auto_rotation_state & AR_NOT_SUPPORTED)) {
-      // If there is no auto rotation sensor or rotation is not supported in
-      // the current configuration, then we can assume that this is a desktop
-      // or a traditional laptop.
-      return true;
-    }
-  }
-
-  // Check if the device is being used as a laptop or a tablet. This can be
-  // checked by first checking the role of the device and then the
-  // corresponding system metric (SM_CONVERTIBLESLATEMODE). If it is being
-  // used as a tablet then we want the OSK to show up.
-  typedef POWER_PLATFORM_ROLE (WINAPI* PowerDeterminePlatformRole)();
-  PowerDeterminePlatformRole power_determine_platform_role =
-    reinterpret_cast<PowerDeterminePlatformRole>(::GetProcAddress(
-      ::LoadLibraryW(L"PowrProf.dll"), "PowerDeterminePlatformRole"));
-  if (power_determine_platform_role) {
-    POWER_PLATFORM_ROLE role = power_determine_platform_role();
-    if (((role == PlatformRoleMobile) || (role == PlatformRoleSlate)) &&
-         (::GetSystemMetrics(SM_CONVERTIBLESLATEMODE) == 0)) {
-      return false;
-    }
-  }
-
-  const GUID KEYBOARD_CLASS_GUID =
-    { 0x4D36E96B, 0xE325,  0x11CE,
-      { 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18 } };
-
-  bool result = false;
-  // Query for all the keyboard devices.
-  HDEVINFO device_info =
-    ::SetupDiGetClassDevs(&KEYBOARD_CLASS_GUID, nullptr,
-                          nullptr, DIGCF_PRESENT);
-  if (device_info == INVALID_HANDLE_VALUE) {
-    return result;
-  }
-
-  // Enumerate all keyboards and look for ACPI\PNP and HID\VID devices. If
-  // the count is more than 1 we assume that a keyboard is present. This is
-  // under the assumption that there will always be one keyboard device.
-  for (DWORD i = 0;; ++i) {
-    SP_DEVINFO_DATA device_info_data = { 0 };
-    device_info_data.cbSize = sizeof(device_info_data);
-    if (!::SetupDiEnumDeviceInfo(device_info, i, &device_info_data)) {
-      break;
-    }
-
-    // Get the device ID.
-    wchar_t device_id[MAX_DEVICE_ID_LEN];
-    CONFIGRET status = ::CM_Get_Device_ID(device_info_data.DevInst,
-                                          device_id,
-                                          MAX_DEVICE_ID_LEN,
-                                          0);
-    if (status == CR_SUCCESS) {
-      // To reduce the scope of the hack we only look for ACPI and HID\\VID
-      // prefixes in the keyboard device ids.
-      if (IMEHandler::WStringStartsWithCaseInsensitive(device_id,
-                                                       L"ACPI") ||
-          IMEHandler::WStringStartsWithCaseInsensitive(device_id,
-                                                       L"HID\\VID")) {
-        // The heuristic we are using is to check the count of keyboards and
-        // return true if the API's report one or more keyboards. Please note
-        // that this will break for non keyboard devices which expose a
-        // keyboard PDO.
-        result = true;
-      }
-    }
-  }
-  return result;
-}
-
-// Based on DisplayVirtualKeyboard() in Chromium's base/win/win_util.cc.
-// static
-void
-IMEHandler::ShowOnScreenKeyboard()
-{
-  if (!IsWin8OrLater() ||
-      !Preferences::GetBool(kOskEnabled, true) ||
-      sShowingOnScreenKeyboard ||
-      IMEHandler::IsKeyboardPresentOnSlate()) {
-    return;
-  }
-
-  nsAutoString cachedPath;
-  nsresult result = Preferences::GetString(kOskPathPrefName, &cachedPath);
-  if (NS_FAILED(result) || cachedPath.IsEmpty()) {
-    wchar_t path[MAX_PATH];
-    // The path to TabTip.exe is defined at the following registry key.
-    // This is pulled out of the 64-bit registry hive directly.
-    const wchar_t kRegKeyName[] =
-      L"Software\\Classes\\CLSID\\"
-      L"{054AAE20-4BEA-4347-8A35-64A533254A9D}\\LocalServer32";
-    if (!WinUtils::GetRegistryKey(HKEY_LOCAL_MACHINE,
-                                  kRegKeyName,
-                                  0,
-                                  path,
-                                  sizeof path)) {
-      return;
-    }
-
-    std::wstring wstrpath(path);
-    // The path provided by the registry will often contain
-    // %CommonProgramFiles%, which will need to be replaced if it is present.
-    size_t commonProgramFilesOffset = wstrpath.find(L"%CommonProgramFiles%");
-    if (commonProgramFilesOffset != std::wstring::npos) {
-      // The path read from the registry contains the %CommonProgramFiles%
-      // environment variable prefix. On 64 bit Windows the
-      // SHGetKnownFolderPath function returns the common program files path
-      // with the X86 suffix for the FOLDERID_ProgramFilesCommon value.
-      // To get the correct path to TabTip.exe we first read the environment
-      // variable CommonProgramW6432 which points to the desired common
-      // files path. Failing that we fallback to the SHGetKnownFolderPath API.
-
-      // We then replace the %CommonProgramFiles% value with the actual common
-      // files path found in the process.
-      std::wstring commonProgramFilesPath;
-      std::vector<wchar_t> commonProgramFilesPathW6432;
-      DWORD bufferSize = ::GetEnvironmentVariableW(L"CommonProgramW6432",
-                                                   nullptr, 0);
-      if (bufferSize) {
-        commonProgramFilesPathW6432.resize(bufferSize);
-        ::GetEnvironmentVariableW(L"CommonProgramW6432",
-                                  commonProgramFilesPathW6432.data(),
-                                  bufferSize);
-        commonProgramFilesPath =
-          std::wstring(commonProgramFilesPathW6432.data());
-      } else {
-        PWSTR path = nullptr;
-        HRESULT hres = ::SHGetKnownFolderPath(FOLDERID_ProgramFilesCommon, 0,
-                                              nullptr, &path);
-        if (FAILED(hres) || !path) {
-          return;
-        }
-        commonProgramFilesPath = nsDependentString(path).get();
-        ::CoTaskMemFree(path);
-      }
-      wstrpath.replace(commonProgramFilesOffset,
-                       wcslen(L"%CommonProgramFiles%"),
-                       commonProgramFilesPath);
-    }
-
-    cachedPath.Assign(wstrpath.data());
-    Preferences::SetString(kOskPathPrefName, cachedPath);
-  }
-
-  LPCWSTR cachedPathPtr;
-  cachedPath.GetData(&cachedPathPtr);
-  HINSTANCE ret = ::ShellExecuteW(nullptr,
-                                  L"",
-                                  cachedPathPtr,
-                                  nullptr,
-                                  nullptr,
-                                  SW_SHOW);
-  sShowingOnScreenKeyboard = true;
-}
-
-// Based on DismissVirtualKeyboard() in Chromium's base/win/win_util.cc.
-// static
-void
-IMEHandler::DismissOnScreenKeyboard()
-{
-  if (!IsWin8OrLater() ||
-      !sShowingOnScreenKeyboard) {
-    return;
-  }
-
-  sShowingOnScreenKeyboard = false;
-
-  // Dismiss the virtual keyboard by generating the ESC keystroke
-  // programmatically.
-  const wchar_t kOSKClassName[] = L"IPTip_Main_Window";
-  HWND osk = ::FindWindowW(kOSKClassName, nullptr);
-  if (::IsWindow(osk) && ::IsWindowEnabled(osk)) {
-    ::PostMessage(osk, WM_SYSCOMMAND, SC_CLOSE, 0);
-  }
-}
-
 } // namespace widget
 } // namespace mozilla
diff --git a/widget/windows/WinIMEHandler.h b/widget/windows/WinIMEHandler.h
index 3f0199e3da6..c859aafa62c 100644
--- a/widget/windows/WinIMEHandler.h
+++ b/widget/windows/WinIMEHandler.h
@@ -120,28 +120,9 @@ private:
   // Additionally, IME context is always disassociated from focused window.
   static bool sIsIMMEnabled;
   static bool sPluginHasFocus;
-  static bool sShowingOnScreenKeyboard;
 
   static bool IsTSFAvailable() { return (sIsInTSFMode && !sPluginHasFocus); }
   static bool IsIMMActive();
-
-  static void MaybeShowOnScreenKeyboard();
-  static void MaybeDismissOnScreenKeyboard();
-  static bool WStringStartsWithCaseInsensitive(const std::wstring& aHaystack,
-                                               const std::wstring& aNeedle);
-  static bool IsKeyboardPresentOnSlate();
-
-  /**
-   * Show the Windows on-screen keyboard. Only allowed for
-   * chrome documents and Windows 8 and higher.
-   */
-  static void ShowOnScreenKeyboard();
-
-  /**
-   * Dismiss the Windows on-screen keyboard. Only allowed for
-   * Windows 8 and higher.
-   */
-  static void DismissOnScreenKeyboard();
 #endif // #ifdef NS_ENABLE_TSF
 };
 
diff --git a/widget/windows/WinUtils.cpp b/widget/windows/WinUtils.cpp
index aa3e19f7bd1..7d70f743172 100644
--- a/widget/windows/WinUtils.cpp
+++ b/widget/windows/WinUtils.cpp
@@ -670,8 +670,7 @@ WinUtils::GetRegistryKey(HKEY aRoot,
     ::RegQueryValueExW(key, aValueName, nullptr, &type, (BYTE*) aBuffer,
                        &aBufferLength);
   ::RegCloseKey(key);
-  if (result != ERROR_SUCCESS ||
-      (type != REG_SZ && type != REG_EXPAND_SZ)) {
+  if (result != ERROR_SUCCESS || type != REG_SZ) {
     return false;
   }
   if (aBuffer) {
diff --git a/widget/windows/nsLookAndFeel.h b/widget/windows/nsLookAndFeel.h
index aca794b7e95..f83dcb8281b 100644
--- a/widget/windows/nsLookAndFeel.h
+++ b/widget/windows/nsLookAndFeel.h
@@ -21,26 +21,6 @@
 #define NID_READY            0x00000080
 #endif
 
-/*
- * Tablet mode detection
- */
-#ifndef SM_SYSTEMDOCKED
-#define SM_CONVERTIBLESLATEMODE 0x00002003
-#define SM_SYSTEMDOCKED         0x00002004
-typedef enum _AR_STATE
-{
-  AR_ENABLED        = 0x0,
-  AR_DISABLED       = 0x1,
-  AR_SUPPRESSED     = 0x2,
-  AR_REMOTESESSION  = 0x4,
-  AR_MULTIMON       = 0x8,
-  AR_NOSENSOR       = 0x10,
-  AR_NOT_SUPPORTED  = 0x20,
-  AR_DOCKED         = 0x40,
-  AR_LAPTOP         = 0x80
-} AR_STATE, *PAR_STATE;
-#endif
-
 class nsLookAndFeel: public nsXPLookAndFeel {
   static OperatingSystemVersion GetOperatingSystemVersion();
 public:

From b31d64f6531b35608ccdd807b369730afd157490 Mon Sep 17 00:00:00 2001
From: Martyn Haigh <mhaigh@mozilla.org>
Date: Wed, 5 Aug 2015 17:27:50 +0100
Subject: [PATCH 45/56] Bug 1188951 - Let tab queues ride the trains;
 r=sebastian

---
 mobile/android/confvars.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index e96d16b83b6..936407e9b43 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -100,9 +100,7 @@ MOZ_ANDROID_MLS_STUMBLER=1
 MOZ_ANDROID_DOWNLOADS_INTEGRATION=1
 
 # Enable Tab Queue
-if test "$NIGHTLY_BUILD"; then
-  MOZ_ANDROID_TAB_QUEUE=1
-fi
+MOZ_ANDROID_TAB_QUEUE=1
 
 # Use the low-memory GC tuning.
 export JS_GC_SMALL_CHUNK_SIZE=1

From ae90f0110ff87231fb6f4d461d0ca619870ccdd7 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 10:00:31 -0700
Subject: [PATCH 46/56] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/9b9d75e4ee18
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1191186 - Stamp gaia-theme@0.5.1
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 044beea2eca..7d1128aa308 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "2905411032bc2ba80a73c43794453963782db607", 
+        "git_revision": "14b4c1b311d61cdee1b6f9cb02fe8720492839cf", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "91ff0f7b832332454f4fb288b6ce906955b9e20e", 
+    "revision": "9b9d75e4ee181574ea540169d8e22d91341b85f9", 
     "repo_path": "integration/gaia-central"
 }

From 6ff70e0fa5aef219d270ae8e0db6a87754f91d9e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 10:02:10 -0700
Subject: [PATCH 47/56] Bumping manifests a=b2g-bump

---
 b2g/config/aries/sources.xml        | 2 +-
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index bde4c35ac98..242231a93d6 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index b53fe8efed0..4e8a2496d86 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index b795bf8ac86..8ccf076f81f 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="2905411032bc2ba80a73c43794453963782db607"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index a5a49a685ee..d1483f68105 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="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 20034745dbd..ff6b4fdc94d 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 85ae667d1aa..e9f7eb55bc3 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index b795bf8ac86..8ccf076f81f 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="2905411032bc2ba80a73c43794453963782db607"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 73d7caaa3fb..cfd427219f0 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 9ac75af5f36..63cb5203400 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index a4338ad792b..801b0f877ce 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2905411032bc2ba80a73c43794453963782db607"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 4ceeea633a3f362895ae2c058d88642fe4a3082b Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 10:20:30 -0700
Subject: [PATCH 48/56] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/99c0d695f209
Author: Zibi Braniecki <zbigniew.braniecki@gmail.com>
Desc: Merge pull request #31105 from zbraniecki/1187627-sms-l10n-api-part2

Bug 1187627 - Update SMS to be ready for L10n API v3, part 2. r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/f9ee4ad448d5
Author: Zibi Braniecki <gandalf@mozilla.com>
Desc: Bug 1187627 - Update SMS to be ready for L10n API v3, part 2
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 7d1128aa308..df2efbe2ff3 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "14b4c1b311d61cdee1b6f9cb02fe8720492839cf", 
+        "git_revision": "988d71285df0b2f823ae3263639f925bb2a7cb4b", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "9b9d75e4ee181574ea540169d8e22d91341b85f9", 
+    "revision": "99c0d695f209355f950f04117aa3d2ee6170a5e3", 
     "repo_path": "integration/gaia-central"
 }

From b9e8388b3da155fa1e2d0ed6f59762cd0b29e0d5 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 10:22:09 -0700
Subject: [PATCH 49/56] Bumping manifests a=b2g-bump

---
 b2g/config/aries/sources.xml        | 2 +-
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index 242231a93d6..8855e2a0ef7 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 4e8a2496d86..1fd147ccde4 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 8ccf076f81f..ad39816d701 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="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index d1483f68105..7708b6497a8 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="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index ff6b4fdc94d..6eb0220a69d 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index e9f7eb55bc3..8b5874e7c0f 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 8ccf076f81f..ad39816d701 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="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index cfd427219f0..a236f7af11b 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 63cb5203400..53ebbdef1ca 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 801b0f877ce..afb5037e1a6 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="14b4c1b311d61cdee1b6f9cb02fe8720492839cf"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From fd3e71878e924694d5cac674b2657d3ff4b1c789 Mon Sep 17 00:00:00 2001
From: Reuben Morais <reuben.morais@gmail.com>
Date: Wed, 5 Aug 2015 15:25:14 -0300
Subject: [PATCH 50/56] Bug 1184667 - Remove some unnecessary const_casts from
 ActorsParent.cpp. r=janv

---
 dom/indexedDB/ActorsParent.cpp | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp
index 803cd998ec0..ec2eb0b2c9a 100644
--- a/dom/indexedDB/ActorsParent.cpp
+++ b/dom/indexedDB/ActorsParent.cpp
@@ -6723,7 +6723,7 @@ class OpenDatabaseOp final
 
   class VersionChangeOp;
 
-  const OptionalContentId mOptionalContentParentId;
+  OptionalContentId mOptionalContentParentId;
 
   nsRefPtr<FullDatabaseMetadata> mMetadata;
 
@@ -7239,7 +7239,7 @@ class ObjectStoreAddOrPutRequestOp final
   const nsCString mOrigin;
   const PersistenceType mPersistenceType;
   const bool mOverwrite;
-  const bool mObjectStoreMayHaveIndexes;
+  bool mObjectStoreMayHaveIndexes;
 
 private:
   // Only created by TransactionBase.
@@ -7357,7 +7357,7 @@ class ObjectStoreDeleteRequestOp final
 
   const ObjectStoreDeleteParams mParams;
   ObjectStoreDeleteResponse mResponse;
-  const bool mObjectStoreMayHaveIndexes;
+  bool mObjectStoreMayHaveIndexes;
 
 private:
   ObjectStoreDeleteRequestOp(TransactionBase* aTransaction,
@@ -7383,7 +7383,7 @@ class ObjectStoreClearRequestOp final
 
   const ObjectStoreClearParams mParams;
   ObjectStoreClearResponse mResponse;
-  const bool mObjectStoreMayHaveIndexes;
+  bool mObjectStoreMayHaveIndexes;
 
 private:
   ObjectStoreClearRequestOp(TransactionBase* aTransaction,
@@ -18790,15 +18790,12 @@ OpenDatabaseOp::OpenDatabaseOp(Factory* aFactory,
   , mVersionChangeOp(nullptr)
   , mTelemetryId(0)
 {
-  auto& optionalContentParentId =
-    const_cast<OptionalContentId&>(mOptionalContentParentId);
-
   if (mContentParent) {
     // This is a little scary but it looks safe to call this off the main thread
     // for now.
-    optionalContentParentId = mContentParent->ChildID();
+    mOptionalContentParentId = mContentParent->ChildID();
   } else {
-    optionalContentParentId = void_t();
+    mOptionalContentParentId = void_t();
   }
 }
 
@@ -22634,7 +22631,7 @@ ObjectStoreAddOrPutRequestOp::ObjectStoreAddOrPutRequestOp(
     aTransaction->GetMetadataForObjectStoreId(mParams.objectStoreId());
   MOZ_ASSERT(mMetadata);
 
-  const_cast<bool&>(mObjectStoreMayHaveIndexes) = mMetadata->HasLiveIndexes();
+  mObjectStoreMayHaveIndexes = mMetadata->HasLiveIndexes();
 }
 
 nsresult
@@ -23565,7 +23562,7 @@ ObjectStoreDeleteRequestOp::ObjectStoreDeleteRequestOp(
     aTransaction->GetMetadataForObjectStoreId(mParams.objectStoreId());
   MOZ_ASSERT(metadata);
 
-  const_cast<bool&>(mObjectStoreMayHaveIndexes) = metadata->HasLiveIndexes();
+  mObjectStoreMayHaveIndexes = metadata->HasLiveIndexes();
 }
 
 nsresult
@@ -23657,7 +23654,7 @@ ObjectStoreClearRequestOp::ObjectStoreClearRequestOp(
     aTransaction->GetMetadataForObjectStoreId(mParams.objectStoreId());
   MOZ_ASSERT(metadata);
 
-  const_cast<bool&>(mObjectStoreMayHaveIndexes) = metadata->HasLiveIndexes();
+  mObjectStoreMayHaveIndexes = metadata->HasLiveIndexes();
 }
 
 nsresult

From 08d6e5b04b7cb5632c349bd84340509547a9398a Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 11:40:37 -0700
Subject: [PATCH 51/56] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/38518bcda490
Author: Zibi Braniecki <zbigniew.braniecki@gmail.com>
Desc: Merge pull request #31242 from zbraniecki/1190771-fix-replacing-phone-numer

Bug 1190771 - Update replacePhoneNumber call from shared dialer.js. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/1bfd798de342
Author: Zibi Braniecki <gandalf@mozilla.com>
Desc: Bug 1190771 - Update replacePhoneNumber call from shared dialer.js
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index df2efbe2ff3..8d1143a7147 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "988d71285df0b2f823ae3263639f925bb2a7cb4b", 
+        "git_revision": "65941f31e9b6ce23b157c54e9f8a14566a344d0c", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "99c0d695f209355f950f04117aa3d2ee6170a5e3", 
+    "revision": "38518bcda49011b21f4092eeff1c21f2c9ef0add", 
     "repo_path": "integration/gaia-central"
 }

From 93cbbdd06b7babaa78da65fd263a0510c540e830 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 11:42:41 -0700
Subject: [PATCH 52/56] Bumping manifests a=b2g-bump

---
 b2g/config/aries/sources.xml        | 2 +-
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index 8855e2a0ef7..5bcbb30fb81 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 1fd147ccde4..e667673a59f 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index ad39816d701..4299fe2190d 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="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 7708b6497a8..98c72beca22 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="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 6eb0220a69d..6706c50be68 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 8b5874e7c0f..a5154608722 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index ad39816d701..4299fe2190d 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="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index a236f7af11b..2ca3a45b3c0 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 53ebbdef1ca..ea683e14b39 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index afb5037e1a6..e9cb0b05b6f 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="988d71285df0b2f823ae3263639f925bb2a7cb4b"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 3a074ed32c5cc7e6c0a51cada05f3d1316a418e1 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 12:00:29 -0700
Subject: [PATCH 53/56] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

========

https://hg.mozilla.org/integration/gaia-central/rev/c14b1e584eb5
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #31198 from yzen/bug-1189919

Bug 1189919 - fixing accessibility visibility issue with ambient indi…

========

https://hg.mozilla.org/integration/gaia-central/rev/ffcfa7612f67
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1189919 - fixing accessibility visibility issue with ambient indicator.
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 8d1143a7147..7f85717c723 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "65941f31e9b6ce23b157c54e9f8a14566a344d0c", 
+        "git_revision": "34ff1f5a704237820ce2e4a4aa09563b23d0e80a", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "38518bcda49011b21f4092eeff1c21f2c9ef0add", 
+    "revision": "c14b1e584eb58c533c8aa36f92ff3d8a6dbad857", 
     "repo_path": "integration/gaia-central"
 }

From fcf6ed1a534cfa4a33fe08b13bb16e5aa684474e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 12:02:07 -0700
Subject: [PATCH 54/56] Bumping manifests a=b2g-bump

---
 b2g/config/aries/sources.xml        | 2 +-
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index 5bcbb30fb81..e920a6a2a72 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index e667673a59f..742055f55a9 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 4299fe2190d..27272bd3370 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="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 98c72beca22..456291f9edb 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="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 6706c50be68..b43028c58f3 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index a5154608722..b643cfd8543 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 4299fe2190d..27272bd3370 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="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 2ca3a45b3c0..edf8695f049 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index ea683e14b39..5e0c9eef637 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index e9cb0b05b6f..bc21ed61113 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="65941f31e9b6ce23b157c54e9f8a14566a344d0c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 5a71dbd35806698de4a3dbc48ff4ab7485259008 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 13:12:52 -0700
Subject: [PATCH 55/56] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/8c8613183a6e
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #31254 from albertopq/1190536-pin-l10n

Bug 1190536 - Locales not picked up on Pinning the web r=tchevalier

========

https://hg.mozilla.org/integration/gaia-central/rev/65e88b56871d
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1190536 - Locales not picked up on Pinning the web
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 7f85717c723..7836d45cea0 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "34ff1f5a704237820ce2e4a4aa09563b23d0e80a", 
+        "git_revision": "4ede0c6bf5fb0c2896d5393032b395999a154619", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "c14b1e584eb58c533c8aa36f92ff3d8a6dbad857", 
+    "revision": "8c8613183a6efdbb9172b2c27ae1e60290398d45", 
     "repo_path": "integration/gaia-central"
 }

From aa70aa4a05405ff8d915a31a9382b553338ce81e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 5 Aug 2015 13:14:30 -0700
Subject: [PATCH 56/56] Bumping manifests a=b2g-bump

---
 b2g/config/aries/sources.xml        | 2 +-
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index e920a6a2a72..08a1bbc4e11 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 742055f55a9..d4454aed78b 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 27272bd3370..eae731dba3a 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="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 456291f9edb..3af87324883 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="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index b43028c58f3..795a741c452 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index b643cfd8543..cb25957a4c0 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 27272bd3370..eae731dba3a 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="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index edf8695f049..9aee8db0e23 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 5e0c9eef637..464b162a59b 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index bc21ed61113..eec1b526f17 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="34ff1f5a704237820ce2e4a4aa09563b23d0e80a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>