Bug 959058 - Map GBK and GB2312 decoder constructors to the GB18030 decoder. r=emk.
Bug 961648 - Provide a helpful error message when test variables JSON file cannot be parsed; r=dhunt
Backed out changeset 88549ccbce60 (bug 959058) for mochitest -m7 orange on android on a CLOSED TREE
Merge mozilla-central to mozilla-inbound
Bug 157846 - Remove padding from textbox.plain. r=roc
Bug 941611 - More consistent rounding of text metrics. r=karlt, r=fredw
Bug 957800 - Make codeword longer to avoid collisions. r=abr
Bug 962447 - [fugu][b2g] should getFailCauseCode() even the connection hasn't been established. r=vicamo
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/69295b3ba8ca
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #15673 from alivedise/bugzilla/961569/fullscreen-modal-dialog

Bug 961569 - Fix modal dialog under mozfullscreen, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/3d86405ad513
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 961569 - Fix modal dialog under mozfullscreen

========

https://hg.mozilla.org/integration/gaia-central/rev/8d669fcdb88a
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #15677 from crdlc/bug-922391

Bug 922391 - [B2g] [E.me] UI overlaps when user tries to delete an app f...

========

https://hg.mozilla.org/integration/gaia-central/rev/a606f1ccaad2
Author: crdlc <crdlc@tid.es>
Desc: Bug 922391 - [B2g] [E.me] UI overlaps when user tries to delete an app from the dock area
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/d6b49ba6226f
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Merge pull request #15549 from jaoo/959986

Bug 959986 - [DSDS] When one SIM is active, still user can access Call Settings of another SIM card. r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/8f9f9129bf60
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Bug 959986 - [DSDS] When one SIM is active, still user can access Call Settings of another SIM card.
Bumping manifests a=b2g-bump
Bug 957949 - [HFP] Add B2G common bluedroid config file, r=echou
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/f4459936dcab
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #15597 from AndreiH/bug962504

Bug 962504 - Investigate intermittent fail on test_cost_control_reset_wi...

========

https://hg.mozilla.org/integration/gaia-central/rev/fdbddb876685
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 962504 - Investigate intermittent fail on test_cost_control_reset_wifi
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/30ed848ece50
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #14503 from viorelaioia/bug_942107_settings

Bug 942107 - Reduce locators, settings app

========

https://hg.mozilla.org/integration/gaia-central/rev/e912a1a1c349
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Reduce locators, settings app
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/0ba4112681b1
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Revert "Revert "Bug 946205 - Re-enable Travis tests after 891882 merged" for mochitest 5 timeouts"

This reverts commit 213d4eff522a9cc557d659d7a2e7038a9935fe4a.
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/9be7377118a2
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #15406 from cctuan/950185

Bug 950185 - [B2G] [Settings] Network type does not show user friendly o...

========

https://hg.mozilla.org/integration/gaia-central/rev/4720e2783666
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 950185 - [B2G] [Settings] Network type does not show user friendly options such as 2G and 3G