Merge mozilla-central to mozilla-inbound on a CLOSED TREE

--HG-- extra : amend_source : f36b57ad286dea1bd9bce4cf5ce086cf4ddf9ba3
dothq · Jan 8, 2016 · d82980a · d82980a
2 parents 1307007 + 4475cf4
commit d82980a
Show file tree

Hide file tree

Showing 143 changed files with 1,261 additions and 661 deletions.
diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
@@ -21,7 +21,7 @@
   <!--
     B2G repositories for all targets
     -->
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="62900f1e42d596c3faa2787a8bd18a8be034b558"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="887a1d7f2ab601fc40b923b4e16e6b9b48fc982e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
   <project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
@@ -21,7 +21,7 @@
   <!--
     B2G repositories for all targets
     -->
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="62900f1e42d596c3faa2787a8bd18a8be034b558"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="887a1d7f2ab601fc40b923b4e16e6b9b48fc982e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
   <project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
@@ -21,7 +21,7 @@
   <!--
     B2G repositories for all targets
     -->
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="62900f1e42d596c3faa2787a8bd18a8be034b558"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="887a1d7f2ab601fc40b923b4e16e6b9b48fc982e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
   <project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
@@ -21,7 +21,7 @@
   <!--
     B2G repositories for all targets
     -->
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="62900f1e42d596c3faa2787a8bd18a8be034b558"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="887a1d7f2ab601fc40b923b4e16e6b9b48fc982e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
   <project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
@@ -21,7 +21,7 @@
   <!--
     B2G repositories for all targets
     -->
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="62900f1e42d596c3faa2787a8bd18a8be034b558"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="887a1d7f2ab601fc40b923b4e16e6b9b48fc982e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
   <project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
@@ -21,7 +21,7 @@
   <!--
     B2G repositories for all targets
     -->
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="62900f1e42d596c3faa2787a8bd18a8be034b558"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="887a1d7f2ab601fc40b923b4e16e6b9b48fc982e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
   <project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
@@ -21,7 +21,7 @@
   <!--
     B2G repositories for all targets
     -->
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="62900f1e42d596c3faa2787a8bd18a8be034b558"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="887a1d7f2ab601fc40b923b4e16e6b9b48fc982e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
   <project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
@@ -21,7 +21,7 @@
   <!--
     B2G repositories for all targets
     -->
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="62900f1e42d596c3faa2787a8bd18a8be034b558"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="887a1d7f2ab601fc40b923b4e16e6b9b48fc982e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
   <project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "62900f1e42d596c3faa2787a8bd18a8be034b558", 
+        "git_revision": "887a1d7f2ab601fc40b923b4e16e6b9b48fc982e", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "e51159a1a86de1eb0e0dc2a3b84dfd03e8be8b8b", 
+    "revision": "bf690aa3ffa8c291b77efda90c45ffff8f3b6778", 
     "repo_path": "integration/gaia-central"
 }
diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml
@@ -21,7 +21,7 @@
   <!--
     B2G repositories for all targets
     -->
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="62900f1e42d596c3faa2787a8bd18a8be034b558"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="887a1d7f2ab601fc40b923b4e16e6b9b48fc982e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
   <project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
@@ -21,7 +21,7 @@
   <!--
     B2G repositories for all targets
     -->
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="62900f1e42d596c3faa2787a8bd18a8be034b558"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="887a1d7f2ab601fc40b923b4e16e6b9b48fc982e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
   <project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
@@ -21,7 +21,7 @@
   <!--
     B2G repositories for all targets
     -->
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="62900f1e42d596c3faa2787a8bd18a8be034b558"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="887a1d7f2ab601fc40b923b4e16e6b9b48fc982e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
   <project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>

diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
@@ -289,7 +289,7 @@ skip-if = os == "mac" || e10s # bug 967013; e10s: bug 1094761 - test hits the ne
 [browser_datareporting_notification.js]
 skip-if = !datareporting
 [browser_datachoices_notification.js]
-skip-if = !datareporting || e10s # bug 1113930
+skip-if = !datareporting
 [browser_devedition.js]
 [browser_devices_get_user_media.js]
 skip-if = buildapp == 'mulet' || (os == "linux" && debug) || e10s # linux: bug 976544; e10s: bug 1071623
@@ -299,7 +299,6 @@ skip-if = e10s # Bug 1071623
 skip-if = e10s # Bug 1071623
 [browser_discovery.js]
 [browser_double_close_tab.js]
-skip-if = e10s
 [browser_documentnavigation.js]
 [browser_duplicateIDs.js]
 [browser_drag.js]
@@ -472,7 +471,7 @@ skip-if = e10s # Bug 1100700 - test relies on unload event firing on closed tabs
 [browser_urlbarDelete.js]
 [browser_urlbarEnter.js]
 [browser_urlbarEnterAfterMouseOver.js]
-skip-if = os == "linux" || e10s # Bug 1073339 - Investigate autocomplete test unreliability on Linux/e10s
+skip-if = os == "linux" # Bug 1073339 - Investigate autocomplete test unreliability on Linux/e10s
 [browser_urlbarRevert.js]
 [browser_urlbarSearchSingleWordNotification.js]
 [browser_urlbarSearchSuggestions.js]

diff --git a/browser/extensions/pdfjs/README.mozilla b/browser/extensions/pdfjs/README.mozilla
@@ -1,3 +1,3 @@
 This is the pdf.js project output, https://github.com/mozilla/pdf.js
 
-Current extension version is: 1.3.142
+Current extension version is: 1.3.161