Bug 953385 - Set math script flag on textruns belonging to MathML tokens. r=roc
Bug 953385 - Tests for OpenType 'math' script in MathML. r=fredw
Bug 960319 - Don't use GLTextures for non-ANGLE D3D WebGL layers. r=vlad
Bug 963123 - NNS Windows build fix to prevent lower case working directories to make the build fail. r=glandium
Bug 964976 - Prevent crash of unsupported pixel format gralloc allocation. r=nical
Bug 965246 - Integrate bulk updates from vtt.js. r=rillian

Relevant changes for bugs 881976 and 964625.
Bug 965247 - ARM simulator: Support an environment variable and shell argument to enabling icache checks. r=jandem
Bug 965740 - Add Microsoft azure to PSL. r=gerv
Bug 965336 - Setting TextTrackCue's Start or End times should set its state to dirty. r=rillian
Bug 965744 - PSL changes for Google private domains. r=gerv
Bug 965587 - Add lock to Firefox Health Report uploading; r=rnewman

Previously, it was technically possible for the FHR client to have
multiple simultaneous uploads. While this should never occur in
well-behaving systems, server logs have indicated that this behavior
might be occurring.

This patch adds a lock around uploading to ensure only 1 upload
operation may be active at a given time.

To measure the impact of this change in the wild, we added a counter
that increments whenever a held lock is encountered.

--HG--
extra : rebase_source : f0bb5065a3618cd335b6b6f31e4e68850f31f151
Bug 961821: jit-support for writes into TypedObject arrays.

As part of above, alpha-renamed IonBuilder::setElemTryTyped to
IonBuilder::setElemTryTypedArray to keep clear the current distinction
between TypedObject and TypedArray.

Drive-by fix: Reference to Bug 894105 in comment had off-by-one typo.
Bug 961821: jit-support for writes into TypedObject arrays (r=nmatsakis).

As part of above, alpha-renamed IonBuilder::setElemTryTyped to
IonBuilder::setElemTryTypedArray to keep clear the current distinction
between TypedObject and TypedArray.

Drive-by fix: Reference to Bug 894105 in comment had off-by-one typo.
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