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

========

https://hg.mozilla.org/integration/gaia-central/rev/e964061bd9cf
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #20712 from davidflanagan/bug1026846

Bug 1026846: require the type parameter for FL app view activity r=amac

========

https://hg.mozilla.org/integration/gaia-central/rev/b46f090450d3
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 1026846: require the type parameter for FL app view activity
Bumping manifests a=b2g-bump
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/e4ead8057e0e
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20730 from lightsofapollo/l10n-collections-shared

Bug 1018708 - Collection localizations for homescreen + add localizations to shared

========

https://hg.mozilla.org/integration/gaia-central/rev/7f1563dc635f
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 1018708 - Collection localizations for homescreen + add localizations to shared

========

https://hg.mozilla.org/integration/gaia-central/rev/f88ecfced1a1
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Merge pull request #20577 from jonallengriffin/tbpl_config

Bug 1013201 - Add in-tree config file for gaia build options used in TBP...

========

https://hg.mozilla.org/integration/gaia-central/rev/741105fd257a
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Bug 1013201 - Add in-tree config file for gaia build options used in TBPL, r=zac
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/fe5fd22c4bcc
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 1026069 - Remove horizontal scroll from search suggestions. r=kgrandon
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/699cc6313901
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20765 from KevinGrandon/bug_1022985_collection_position_2

Bug 1022985 - SmartCollection is not placed where you tap

========

https://hg.mozilla.org/integration/gaia-central/rev/e15d636fd5a4
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1022985 - SmartCollection is not placed where you tap r=daleharvey
Bumping manifests a=b2g-bump
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/f63da6a0876a
Author: KWierso <kwierso@gmail.com>
Desc: Merge branch 'master' of https://github.com/mozilla-b2g/gaia

========

https://hg.mozilla.org/integration/gaia-central/rev/9cfe547c33be
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 1018708 - Collection localizations for homescreen + add localizations to shared"

This reverts commit 5e91d8c81885c93492b128dc1797c8fe1d98fe1a.

========

https://hg.mozilla.org/integration/gaia-central/rev/6dadaa3613a0
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Merge pull request #20730 from lightsofapollo/l10n-collections-shared" for Gaia-unit failures

This reverts commit a74ed1e3f982633950c2f93bbb46e71be6399da6, reversing
changes made to a07855aedfe8fba42dac3c8506549870c89432c7.
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/7dbce5ade723
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20773 from KevinGrandon/bug_1018708_reland

Bug 1018708 - Collection localizations for homescreen + add localizations to shared

========

https://hg.mozilla.org/integration/gaia-central/rev/ba87e2fc0ad8
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 1018708 - Collection localizations for homescreen + add localizations to shared r=kgrandon
Bumping manifests a=b2g-bump
Merge m-c to b2g-inbound
Merge m-c to b2g-inbound
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c723c818287c
Author: Jared Hirsch <ohai@6a68.net>
Desc: Merge pull request #20638 from 6a68/bug-1019418-fxa-system-l10n

Bug 1019418 - Localize the FxA system app code

========

https://hg.mozilla.org/integration/gaia-central/rev/537ad2470ffd
Author: Jared Hirsch <ohai@6a68.net>
Desc: Bug 1019418 - Correctly localize the firefox accounts system app. r=ferjm

    Because the individual panels are dynamically loaded, we needed to
    manually call mozL10n.translate(panelElement) as part of the panel
    loading process.

    Other updates:
    * Remove data-l10n-ids from elements that are manually translated
    * Localize the correct element in enter password screen.
    * Remove out-of-date references to user email in refreshAuth screen.
    * Remove user email placeholder from refreshAuth template.
Bumping manifests a=b2g-bump
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/6855ccbf30da
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #20719 from gasolin/issue-1024285

Bug 1027465 - [settings] move root panel nfc item into panels/root, r=arthur

========

https://hg.mozilla.org/integration/gaia-central/rev/81e0497a89da
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1027465 - [settings] move root panel nfc item into panels/root

- remove nfc.js from xfail.list

========

https://hg.mozilla.org/integration/gaia-central/rev/9bf871fc69e9
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #20659 from cctuan/1020264

Bug 1020264 - [flame] Status bar is displayed after launching video app and you can't play a video until it dissapears

========

https://hg.mozilla.org/integration/gaia-central/rev/556e688221f4
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 1020264 - [flame] Status bar is displayed after launching video app and you can't play a video until it dissapears

========

https://hg.mozilla.org/integration/gaia-central/rev/b40a84b85c4a
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #20644 from cctuan/1024940

Bug 1024940 - [Settings] Permissions that are explicit for privileged or web apps are not shown on Settings -> Apps permissions

========

https://hg.mozilla.org/integration/gaia-central/rev/6b8e176bfe99
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 1024940 - [Settings] Permissions that are explicit for privileged or web apps are not shown on Settings -> Apps permissions
Bumping manifests a=b2g-bump
Bug 1026737 - Implement listener counting on DOMRequestHelper r=fabrice
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/acb6215df962
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #19899 from mschwart/bug991949

Bug 991949 - Cell broadcast ETWS messages show undefined, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/3c8f0d8097aa
Author: Michael Schwartz <mschwart@codeaurora.org>
Desc: Bug 991949 - Cell broadcast ETWS messages show undefined

ETWS messages without a message body use a canned body depending on the
warning type.

Change-Id: I25491fd85894d334bd6a9ab63105379de495ef2a