Bug 891693 - Ban SOS with repeated components IDs. r=jmuizelaar, r=DRC, a=abillings
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/5addf8ecfeb6
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Merge pull request #13784 from jaoo/927486-v1.2

(v1.2) Bug 927486 - [Settings] Modify Message settings category. r=arthurcc

========

https://hg.mozilla.org/integration/gaia-1_2/rev/2f4b47248295
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: (v1.2) Bug 927486 - [Settings] Modify Message settings category. r=arthurcc
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/4f66ff773ab9
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #13700 from Pike/bug-938052-keyboard-js-errors

bug 938052, better report js errors in keyboard layouts, and fix a few, r=djf, rudyl, yuren(cherry picked from commit 42a20aee4866b67d1adb83a96a826040ed5b2c48)
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/74274a6733f6
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 924565 - Use Applications.installedApps in gaiatest. r=dhunt
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/08a41d8119c0
Author: Lyall Jonathan Di Trapani <lj.ditrapani@gmail.com>
Desc: Bug 935319 - Improve gaia-ui-tests documentation for users getting starting with b2g-desktop builds. r=dhunt
Bug 927254 - Purge SkiaGL texture cache on memory pressure. r=snorp, a=koi+
Bug 911063 - Add marionette tests for WebFM. r=khuey, a=test-only
Bug 933272 - Click to play "Tap here to activate plugin." is not localized on multi-locale build. r=mfinkle, a=lsblakk
Bug 928800 - Doorhanger, while showing, should respect dynamic toolbar's dynamicness. r=mfinkle, a=lsblakk
Bug 932854 - When a site uses a hidden plugin, show a notification bar to aid discoverability. This patch, suitable for trunk and branch, uses existing strings which are not ideal. r=jaws, a=lsblakk
Bug 932854 - Test fixup: Reset the test plugin state only after the UI has finished checking plugin state. r=gfritzsche, a=lsblakk
Bug 932854 - Temporary test workaround for test_keycodes.xul. r=jimm, a=lsblakk
Bug 932854 - Add telemetry for showing the plugin infobar and its two buttons. r=jaws, a=lsblakk
Bug 941137 - Alter plugin defaults on the beta/release channel so that Java is still click-to-activate by default, but other plugins are not for the next few releases while we articulate a potential whitelist/transition strategy. r=gfritzsche, a=lsblakk
Bug 941137 followup - fix xpcshell test which expects the test plugin to be click-to-activate to actually set the state it desires. a=test-only
Bug 915184 - Wait for the default about:privatebrowsing page to appear before continuing the test. r=ehsan, a=test-only
Bug 934066 - Add a simple parent/child synchronization mechanism for xpcshell tests. r=ted, a=test-only
Bug 707275, Part 1: Add telemetry for TLS intolerance, r=keeler, a=lsblakk

--HG--
extra : source : 2f3ce72ec2d8e48ae2b816fd8248b10e917b7295
Bug 707275, Part 2: Add telemetry for cipher suites and key sizes, r=keeler, a=lsblakk

--HG--
extra : source : 53dffb3da44637c3aff3db9634f712f1f0985834
Bug 932281 - Extend TelemetryHistogram.{id_offset, comment_offset} to uint32_t. r=nfroyd, a=lsblakk

--HG--
extra : source : e91a4b7fbb2fcff64fefe7c6532f42a935e2183a
extra : amend_source : 5f329bbed9f07a59ccd3ccc45494ead16cd58511