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

========

https://hg.mozilla.org/integration/gaia-central/rev/3d0d3b3e1556
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #14528 from snowmantw/issue948299

Bug 948299 - [BuildScript] Use PROFILE_DIR instead of PROFILE_FOLDER in the extension handling module

========

https://hg.mozilla.org/integration/gaia-central/rev/5d4be4ab7ce5
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 948299 - [BuildScript] Use PROFILE_DIR instead of PROFILE_FOLDER in the extension handling module

========

https://hg.mozilla.org/integration/gaia-central/rev/5280aba84106
Author: Askeing Yen (fyen) <askeing@gmail.com>
Desc: Merge pull request #14580 from zacc/bug_948822

Bug 948822 - Fix xfail message for test_cards_view_with_two_apps.py

========

https://hg.mozilla.org/integration/gaia-central/rev/d803c6844afb
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 948822 - Fix xfail message for test_cards_view_with_two_apps.py
Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/8657b910fdcd
Author: GaryChen(pychen) <mmm198219@gmail.com>
Desc: Merge pull request #14563 from mpizza/Bug_944009

Bug 944009 - [B2G][Keyboard] Keyboard does not always display when tapping on a text field. r=timdream,
        -- handle OOM

========

https://hg.mozilla.org/integration/gaia-central/rev/0088f409b65a
Author: mpizza <mmm198219@gmail.com>
Desc: Bug 944009 - [B2G][Keyboard] Keyboard does not always display when tapping on a text field
    -- handle OOM

========

https://hg.mozilla.org/integration/gaia-central/rev/84a2d07e16ed
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #14553 from alivedise/bugzilla/948792/cardview-transition

Bug 948792 - Fix cardview transition, r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/b429f6fca1d6
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 948792 - Fix cardview transition
Merge m-c to inbound.
Bug 940884 - 1/3: B2G SMS: Create MobileMessageDB.jsm for automation tests. r=khuey

--HG--
rename : dom/mobilemessage/src/gonk/MobileMessageDatabaseService.js => dom/mobilemessage/src/gonk/MobileMessageDB.jsm
Bug 940884 - 2.a/3.  Changes to adopt MobileMessageDB.jsm. r=gene
Bug 940884 - 2.b/3. Move init functions out of MobileMessage constructor. r=gene
Bug 940884 - 3/3. test cases. r=gene
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/a91a7956eb49
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #14564 from EragonJ/bug-948769

Bug 948769 - [Settings][DSDS] Default service ID should be a number

========

https://hg.mozilla.org/integration/gaia-central/rev/302a148e42af
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 948769 - [Settings][DSDS] Default service ID should be a number

- make all settings from String to Number
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/5bfef5faac50
Author: evelynhung <jj.evelyn@gmail.com>
Desc: Merge pull request #14368 from svic/rebase-df070d4e-NFC-Settings-permission

Bug 946047: Add nfc read only permissions to Settings UI to allow navigator.mozNfc DOM to be created. r=evelyn

========

https://hg.mozilla.org/integration/gaia-central/rev/faaf2b447dad
Author: Garner Lee <garner.lee@telekom.com>
Desc: Bug 946047: Add nfc read only permissions to Settings UI to allow navigator.mozNfc DOM to be created.

This fix is needed for apps using NFC if "HasNfcSupport" is added to the navigator MozNfc WebIDL.

Conflicts:
	apps/settings/manifest.webapp
Bug 948829: use MOZ_NUWA_PROCESS flag to disable nuwa. r=me
merge b2g-inbound to mozilla-central