Bug 968348: Remove some set-but-never-read variables, an inline a PR_LOGGING-only variable, to fix build warnings in security/manager/ssl/src/. r=keeler
Bug 968363: Mark security/manager/ssl/src/ as FAIL_ON_WARNINGS. r=briansmith
Bug 965897: Assert that we have the right prescontext in nsHTMLReflowState constructor, and convert some existing NS_PRECONDITION null-checks into MOZ_ASSERTs. r=mats
Bug 910211 - Guess the fallback encoding from the top-level domain when feasible. r=emk.
Bug 956218 - '(PBackground) Add a mechanism for communicating with a non-main I/O thread via thread and process links'. r=mrbkap.
Bug 956218 - Make sure that all callbacks are called, r=bent.
Bug 956218 - '(PBackground) Fix silly cast issue.'
Backout bug 956218 for link error.
Bug 966528 - Use a specific IPDL message for component alpha. r=mattwoodrow
Merge mozilla-central to mozilla-inbound
Bug 967167 - Use fallible memory allocation when reading IPDL array types to make sure that we don't OOM for very large arrays; r=bent
Bug 956218 - '(PBackground) Add a mechanism for communicating with a non-main I/O thread via thread and process links'. r=mrbkap.
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/2bada567e78f
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #15969 from timdream/zh-layout-rename

Bug 967237 - Shorten the Zh layout labels, r=rudyl

========

https://hg.mozilla.org/integration/gaia-central/rev/d26decb398ea
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 967237 - Shorten the Zh layout labels
Bumping manifests a=b2g-bump
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/8da926267a7e
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #15736 from fcampo/subject-too-high-bug963050

Bug 963050 - [SMS] Subject's line-height in composer is too high
r=julien

========

https://hg.mozilla.org/integration/gaia-central/rev/f4751bd645e2
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Bug 963050 - [SMS] Subject's line-height in composer is too high

========

https://hg.mozilla.org/integration/gaia-central/rev/62c20e1815be
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #15823 from mihai/bug_952554

Bug 952554 - [SMS] Find contacts when searching with multiple terms...
r=julien

========

https://hg.mozilla.org/integration/gaia-central/rev/e87cc9bdf3f7
Author: Mihai Cirlanaru <mihai@cirlanaru.com>
Desc: Bug 952554 - [SMS] Find contacts when searching with multiple terms which also include tel number
Bumping manifests a=b2g-bump
Bug 966899 - Rocketbar is not enabled after OTA update. Bump settingsDB version to read settins.json. r=bent
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/989491c72232
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 962938 - Inconsistent file path in zip file

========

https://hg.mozilla.org/integration/gaia-central/rev/9888e443d4ab
Author: Fabrice Desre <fabrice@desre.org>
Desc: Bug 962976 - Use a blacklist to avoid compressing specific file types which are already compressed r=yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/ec0c974e434e
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #15961 from yurenju/uncompress-2

Bug 957497 - Allow include of uncompressed data files in the package apps r=@timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/50c1ebb651a7
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 957497 - Allow include of uncompressed data files in the package apps

Conflicts:
	build/utils-xpc.js
	build/utils.js
Bumping manifests a=b2g-bump