Bug 980549 - Fix various races in settings and contacts, r=gwagner.

--HG--
extra : transplant_source : a%5E%3D%1BD%99%FB%20%9B7%A6%94%5C%29q%3C%ECv%D4%E4
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/31acef1532cc
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #18308 from cctuan/968661-3

Bug 968661 - Extract new build module webapp-shared.js from webapp-zip.j...

========

https://hg.mozilla.org/integration/gaia-central/rev/fb2f6723539a
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 968661 - Extract new build module webapp-shared.js from webapp-zip.js
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/f0a0245b0c61
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #18399 from gasolin/issue-996264

Bug 996264 - [B2G][Gaia]Selecting 'more info' in the geolocation prompt ..., r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/a7dae1da09ca
Author: gasolin <gasolin@gmail.com>
Desc: Bug 996264 - [B2G][Gaia]Selecting 'more info' in the geolocation prompt does not expand more information
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/adf4120314a9
Author: Yoshi Huang <allstars.chh@mozilla.com>
Desc: Merge pull request #18407 from allstarschh/Bug997623

Bug 997623 - NFC: typo for NDEF_FORMATABLE. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/8551a184a46a
Author: Yoshi Huang <allstars.chh@mozilla.com>
Desc: Bug 997623 - NFC: typo for NDEF_FORMATABLE. r=alive
Bumping manifests a=b2g-bump
Bug 965970 - Add support to compile asm.js code at install/update time r=luke,bholley,marco
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/3e54f1dde9af
Author: Albert <acperez@tid.es>
Desc: Merge pull request #18026 from acperez/bug-912445

Bug 912445 - Show specific information when there is a server connection issue with an application.

========

https://hg.mozilla.org/integration/gaia-central/rev/60811d916e8e
Author: Albert <acperez@tid.es>
Desc: Bug 912445 - Show specific information when there is a server connection issue with an application.
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/f9ed3cf598ec
Author: John Ford <john@johnford.info>
Desc: Revert "Merge pull request #18308 from cctuan/968661-3"

This reverts commit 5888971a38db832241e0cf40e4f9d5e32333db51, reversing
changes made to 76c94ac5dc3b8e17cc23d9cc3e2662b0d5d28b2e.

see https://bugzilla.mozilla.org/show_bug.cgi?id=968661#c35
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/5949a2dd24a0
Author: AndreiH <andrei.hutusoru@softvision.ro>
Desc: Merge pull request #18411 from zacc/bug_997633

Bug 997633 - Update Python marionette_client to 0.7.6

========

https://hg.mozilla.org/integration/gaia-central/rev/34cff87cb2ca
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 997633 - Update Python marionette_client to 0.7.6
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/8b445f90aa40
Author: AndreiH <andrei.hutusoru@softvision.ro>
Desc: Merge pull request #17073 from zacc/bug_979914

Bug 997673 - Refactor of cost control python tests

========

https://hg.mozilla.org/integration/gaia-central/rev/6423b5c63f24
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 997673 - Small refactor of Python cost control app tests
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/911dce24602d
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #18449 from gasolin/issue-993832

Bug 993832 - wrong multi-res resource file name, r=yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/83d423571bae
Author: gasolin <gasolin@gmail.com>
Desc: Bug 993832 - wrong multi-res resource file name
Bumping manifests a=b2g-bump
Bug 995101 - NFC: Don't use nfc-hardware-state-change event to enable/disable NFC. r=dimi
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/76e2b06e43a8
Author: Yoshi Huang <allstars.chh@mozilla.com>
Desc: Merge pull request #18313 from allstarschh/Bug995101

Bug 995101 - NFC: Don't use nfc-hardware-state-change event to enable/disable NFC. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/1504968ab6b7
Author: Yoshi Huang <allstars.chh@mozilla.com>
Desc: Bug 995101 - Don't use nfc-hardware-state-change event. r=alive