Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/0a6e7c81947c
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #21809 from yurenju/preferences

Bug 1039219 - Migrate all snippets for preferences in Makefile to preferences.js r=@gduan

========

https://hg.mozilla.org/integration/gaia-central/rev/b5984280479f
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 1039219 - Migrate all snippets for preferences in Makefile to preferences.js r=gduan

Conflicts:
	build/preferences.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/55093d1af8ed
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #22666 from crh0716/1044405

Bug 1044405 - Should set a empty string if there are no text and l10n provided. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/80bd6475bdd1
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1044405 - Should set a empty string if there are no text and l10nid provided
Bumping manifests a=b2g-bump
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/b1480a4c6393
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #22681 from nmunro/master

Bug 1048021 - Mass replace pageX/pageY to clientX/clientY for keyboard app, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/e24f08253931
Author: Neil Munro <neilmunro@gmail.com>
Desc: Bug 1048021 - Mass replace pageX and pageY to clientX and clientY for keyboard app.

========

https://hg.mozilla.org/integration/gaia-central/rev/3917a6d04360
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #22699 from timdream/keyboard-vwrapper-css2

Bug 1048025 - Set pointer-events: none on child elements of keys, r=rudyl

========

https://hg.mozilla.org/integration/gaia-central/rev/cfb919f93549
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1048025 - Set pointer-events: none on child elements of keys
Bumping manifests a=b2g-bump
Merge  m-c to b-i, a=merge
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/e38478b814fe
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #22707 from snowmantw/issue1037284

Bug 1037284 - [NFC] Screen shows wired and NFC function broken when clic...

========

https://hg.mozilla.org/integration/gaia-central/rev/f1cf997ae183
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 1037284 - [NFC] Screen shows wired and NFC function broken when click home button while initial shrinking UI
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/fe641115270a
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #22704 from timdream/hardwarebuttons-testfix

Bug 999605 - Fix intermittent error in HardwareButtons tests, r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/90a600244943
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 999605 - Fix intermittent error in HardwareButtons tests
Bumping manifests a=b2g-bump
Bug 1048093: Delete sent socket-data objects instead of raw data, r=kyle

After successfully sending data, |SocketIOBase::SendPendingData|
deletes the raw data instead of the actual socket-data object. The
behavior is undefined and leads to a segmentation fault.

This patch fixes the bug by deleting the correct object.
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/73f60238c23e
Author: Carmen Jiménez <cjc@tid.es>
Desc: Merge pull request #22667 from mcjimenez/bug1049842_v2

Bug1049842 - Change downloadUdatesVia2GForbidden text (r = [flod, matej, alive] )

========

https://hg.mozilla.org/integration/gaia-central/rev/47ff064d2118
Author: Carmen Jimenez Cabezas <cjc@tid.es>
Desc: Bug1049842 - Change downloadUdatesVia2GForbidden text
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/eb9eb2e3bc6a
Author: chirarobert <robert.chira@softvision.ro>
Desc: Merge pull request #22629 from viorelaioia/bug-1040063

Bug 1040063 - [v2.1][v2.0] Intermittent test_settings_do_not_track.py fa...

========

https://hg.mozilla.org/integration/gaia-central/rev/a5dd10af2fdc
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 1040063 - [v2.1][v2.0] Intermittent test_settings_do_not_track.py failure
Bumping manifests a=b2g-bump
Bug 1049351 - [NFC] fix testPeerShouldThrow. r=dimi
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c8d15d0a5f06
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #22675 from wilsonpage/1050801

Bug 1050801 - Update shared/elements/gaia-header/ to ~v0.3.0

========

https://hg.mozilla.org/integration/gaia-central/rev/9abed024881a
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1050801 - Update shared/elements/gaia-header/ to ~v0.3.0
Bumping manifests a=b2g-bump
Bug 1051738 - B2G NFC: typo in getNFCPeer. r=dimi

From bea6af520beedcc4547ce5c45c4d78faa63d5812 Mon Sep 17 00:00:00 2001
---
 dom/nfc/nsNfc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)