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

========

https://hg.mozilla.org/integration/gaia-central/rev/3e18cbfa2960
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #18868 from staktrace/flashfix

Bug 1004505 - Avoid double-quoting variables, resulting in invalid JSON,  r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/0b18a3b9bb84
Author: Kartikaya Gupta <kgupta@mozilla.com>
Desc: Bug 1004505 - Avoid double-quoting variables, resulting in invalid JSON. r=timdream
Bumping manifests a=b2g-bump
Bug 959059 - B2G NFC: Marionette test to check P2P registration for an incorrect manifest Url. r=allstars.chh
Bug 959059: [NFC] CheckP2PRegistration should return error if sessionToken doesn't exist. r=allstars.chh
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/2796d30073cc
Author: Zibi Braniecki <zbigniew.braniecki@gmail.com>
Desc: Merge pull request #18498 from zbraniecki/996291-use-mozl10n-once-in-cal

Bug 996291 - mozL10n bootstrap code cleanup in Calendar. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/ba11f59c13bc
Author: Zbigniew Braniecki <gandalf@mozilla.com>
Desc: Bug 996291 - mozL10n bootstrap code cleanup in Calendar; r=kgrandon
Bumping manifests a=b2g-bump
merge b2g-inbound to mozilla-central