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

========

https://hg.mozilla.org/integration/gaia-central/rev/6ac60fe55430
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #20294 from chirarobert/tap_mp_icon

Bug 1023208 - [v2.0][v2.1] Fix test_marketplace_launch failure

========

https://hg.mozilla.org/integration/gaia-central/rev/255cd65fd715
Author: chirarobert <robert.chira@softvision.ro>
Desc: Bug 1023208 - [v2.0][v2.1] Fix test_marketplace_launch failure
Bumping manifests a=b2g-bump
Bug 1023857 - Add dosfstools dependency for usbdisk.img on Flame r=catlee
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/6e191494a8df
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #20139 from wilsonpage/1021284

Bug 1021284 - [camera] [flame] spinner appears after every photo capture

========

https://hg.mozilla.org/integration/gaia-central/rev/7a3d9c17024b
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1021284 - [camera] [flame] spinner appears after every photo capture
Bumping manifests a=b2g-bump
Bug 833633 - Remember permissions granted by users for PROMPT_ACTION through an update. r=ferjm
Bug 960897 - Add marionette test cases for touch caret. r=roc, r=mdas

Add marionette test cases for touch caret feature in bug 924692. Test
cases cover <input>, <textarea>, and contenteditable elements with
touch caret enabled and disabled.

Enlarge touch caret expiration time to 60 seconds to avoid intermittent
test failures in test cases which need to move touch caret.

Thanks Phoebe Chang <natsuki011077@gmail.com> for the WIP patch.
Thanks C.J. Ku <cku@mozilla.com> for various suggestions.

Run tests on browser manually:
./mach marionette-test layout/base/tests/marionette/test_touchcaret.py
Bug 1017115 - Fixes rule-view's highlight race condition to avoid duplicate headers; r=bgrins

--HG--
rename : browser/devtools/styleinspector/test/browser_ruleview_content.js => browser/devtools/styleinspector/test/browser_ruleview_content_01.js
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/b8275b26a982
Author: gitmai <mri@tid.es>
Desc: Merge pull request #20298 from gitmai/bug-1008987-import-vcard

Bug 1008987 - [Contacts][Merger] Thumbnail on contacts list disappear wh...
r=jmcf

========

https://hg.mozilla.org/integration/gaia-central/rev/995c11726c4c
Author: mai <mri@tid.es>
Desc: Bug 1008987 - [Contacts][Merger] Thumbnail on contacts list disappear when importing same vCard/.vcf file several times

========

https://hg.mozilla.org/integration/gaia-central/rev/f5049ee5486f
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #20249 from TheoChevalier/patch-3

Bug 1017918 - Add mai (Maithili) to Gaia languages

========

https://hg.mozilla.org/integration/gaia-central/rev/4f95c7b62d28
Author: Théo Chevalier <theo.chevalier11@gmail.com>
Desc: Bug 1017918 - Add mai (Maithili) to Gaia languages

========

https://hg.mozilla.org/integration/gaia-central/rev/4479cb0315b6
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #19727 from DouglasSherk/1005823-emergency-call

Bug 1005823 - [Dialer] Fix emergency calls with no SIM card. r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/00c18f2e8f69
Author: DouglasSherk <github@sherk.me>
Desc: Bug 1005823 - [Dialer] Fix emergency calls with no SIM card. r=rik
Bumping manifests a=b2g-bump
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c600a2871b21
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #20368 from arcturus/bug-1023908

Bug 1023908 - [Contacts] Disable interminent integration test r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/9db605e46a0e
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 1023908 - [Contacts] Disable interminent integration test

========

https://hg.mozilla.org/integration/gaia-central/rev/88fa6799f71d
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #20234 from crdlc/bug-1022390

Bug 1022390 - [Vertical] Cancel download of apps

========

https://hg.mozilla.org/integration/gaia-central/rev/7144e5a59a2b
Author: crdlc <crdlc@tid.es>
Desc: Bug 1022390 - [Vertical] Cancel download of apps
Bumping manifests a=b2g-bump
Bumping gaia.json for 5 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/d6cf58c5909e
Author: Ben Francis <ben@tola.me.uk>
Desc: Revert "Bug 1020685: Close only over the URL string that we need. r=bfrancis"

This reverts commit dfa599e45b6da54439374d1983fc10d21d9ebf54.

========

https://hg.mozilla.org/integration/gaia-central/rev/5ac945b0696a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20255 from eeejay/bug-1022939

Bug 1022939 - Add ARIA markup for gaia-radio and give example for radio menu items.

========

https://hg.mozilla.org/integration/gaia-central/rev/776f0d952040
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 1022939 - Add ARIA markup for gaia-radio and give example for radio menu items.

========

https://hg.mozilla.org/integration/gaia-central/rev/f0c067a8de44
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20220 from crdlc/bug-1022474

Bug 1022474 - Cannot add an e.me app to the homescreen via wrapper

========

https://hg.mozilla.org/integration/gaia-central/rev/1ed317d49f0a
Author: crdlc <crdlc@tid.es>
Desc: Bug 1022474 - Cannot add an e.me app to the homescreen via wrapper
Bumping manifests a=b2g-bump
Merge mozilla-central and b2g-inbound
Merge mozilla-central and fx-team
Bug 1018468 - Provide a fullscreen button in videos. r=mfinkle
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/ac41749c5404
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20359 from EverythingMe/1023312-floor-dimension

Bug 1023312 - [Vertical homescreen] Smart collection viewing fails on the flame because e.me server fails to return background. [r=amirn]

========

https://hg.mozilla.org/integration/gaia-central/rev/fd7ed5cbcc61
Author: Ran Ben Aharon <ran@ranbena.com>
Desc: Bug 1023312 - [Vertical homescreen] Smart collection viewing fails on the flame because e.me server fails to return background. [r=amirn]

========

https://hg.mozilla.org/integration/gaia-central/rev/ab926c616615
Author: Jared Hirsch <ohai@6a68.net>
Desc: Merge pull request #20372 from 6a68/revert-bug-1004251

Revert "Bug 1004251 - Add resend verification email to firefox accounts....

========

https://hg.mozilla.org/integration/gaia-central/rev/0a757abe9870
Author: Jared Hirsch <ohai@6a68.net>
Desc: Revert "Bug 1004251 - Add resend verification email to firefox accounts. r=ferjm,arthurcc"

This reverts commit f8f70f699d50d3669b507c1bad245b1709c95a50.

Conflicts:
	apps/settings/js/firefox_accounts/panel.js
Bumping manifests a=b2g-bump
Bug 817716 - Add 3-dot menu to tabs panel, including a "close all tabs" option. r=bnicholson