Bug 899187 - add a Robocop tests for Bookmarks Folders and the Bookmarks Page. r=lucasr
Merge m-c to fx-team.
Bug 934750 - Don't cancel content touch events unless APZC consumes them [r=jimm,kats]

This is necessary for our "cross-slide" hack to work.  We need to send
input to both content and APZC until the input passes the pan threshold, so
that the start page can use touch events without disabling async panning.

In the long run we hope to use "touch-action: pan-x" for this and no longer
rely on this hack.
Bug 935554 - Don't show navbar when url changes in a background tab. r=rsilveira
Bug 927172 - Can't touch scroll when second monitor is attached r=jimm

--HG--
extra : rebase_source : 9d583bda2e6def27f5f99c74481635dd79621179
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/430203851f6f
Author: ochameau <poirot.alex@gmail.com>
Desc: Merge pull request #13258 from ochameau/simulatorMode

Bug 930104 - Add SIMULATOR=1 to prevent shipping firefox addons in simulator profile r=yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/9b3bb9856c02
Author: Alexandre Poirot <poirot.alex@gmail.com>
Desc: Bug 930104 - Add SIMULATOR=1 to prevent shipping firefox addons in simulator profile
Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/2c67ef52ef14
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 932859 - Make the client provisioning PIN strings an input placeholder r=me
Bug 934106 - Reduce ImageClient holding video frame number to one. r=nical
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/0fcdcfc13086
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #13404 from mcav/bleach-js-case-sensitivity

Bug 935276 - [email] Bleach.js doesn't handle closing HTML tags with different case. r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/e96d74b771f0
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 935276 - [email] Bleach.js doesn't handle closing HTML tags with different case. r=asuth
Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/f3af2b225255
Author: Alexandre Lissy <lissyx+github@lissyx.dyndns.org>
Desc: Bug 932271 - Reset context menu state at the correct moment. r=daleharvey

Displaying the context menu in the browser app is controlled by a
barrier. We have to make sure that this barrier is correctly reset at
the right time to ensure that the context menu will work more than once:
setting the state before doing the callback is safer than relying on the
callback to handle it by itself.
Bug 891882 - Enable touch event on B2G desktop r=vingtetun
Merge m-c to b2g-inbound.
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/f0d719eccb3f
Author: Jim Porter <squibblyflabbetydoo@gmail.com>
Desc: Merge pull request #12596 from jimporter/music-lockscreen-2

Bug 891024 - [Music] [User Story] Provide access to music player controls when the screen is locked

========

https://hg.mozilla.org/integration/gaia-central/rev/a4f7723a76de
Author: Jim Porter <jporter@mozilla.com>
Desc: Bug 891024 - [music] Add media playback controls to the lockscreen; r=alive, ui-r=jsavory, f=gaye, f=eragonj
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/a79efee39d18
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #13439 from eeejay/bug-930587

Bug 930587 - [homescreen] Use aria-hidden on offscreen pages instead of ...

========

https://hg.mozilla.org/integration/gaia-central/rev/84fadf5552b4
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 930587 - [homescreen] Use aria-hidden on offscreen pages instead of visibility for perf.
Bumping gaia.json for 6 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/b10aefb60249
Author: ochameau <poirot.alex@gmail.com>
Desc: Merge pull request #12838 from kumar303/dev-payments

Bug 855143 - Add Marketplace dev apps r=ochameau

========

https://hg.mozilla.org/integration/gaia-central/rev/14eed39bcfd7
Author: Kumar McMillan <kumar.mcmillan@gmail.com>
Desc: Add Marketplace dev apps (bug 855143)

========

https://hg.mozilla.org/integration/gaia-central/rev/1fdd5fd738c4
Author: Ran Ben Aharon <ran@everything.me>
Desc: Merge pull request #13400 from EverythingMe/marketapp

[Bug 925806] Marketplace results to open in the marketplace app [r=crdlc]

========

https://hg.mozilla.org/integration/gaia-central/rev/0336e3421638
Author: Ran Ben Aharon <ran@ranbena.com>
Desc: [Bug 925806] Marketplace results to open in the marketplace app [r=crdlc]

========

https://hg.mozilla.org/integration/gaia-central/rev/63093edf4c7e
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #13441 from eeejay/bug-935708

Bug 935708 - [homescreen] Use querySelector instead of querySelectorAll ...

========

https://hg.mozilla.org/integration/gaia-central/rev/ffdb8b303cbb
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 935708 - [homescreen] Use querySelector instead of querySelectorAll in save_bookmark_test.js
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/1f7e70f3ad1c
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #13335 from KevinGrandon/bug_924274_contact_tests

Bug 924274 - [Contacts] Add initial marionette tests

========

https://hg.mozilla.org/integration/gaia-central/rev/3359c37e6722
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 924274 - [Contacts] Add initial marionette tests
Backed out changeset 3b0468c92157 (bug 891882) for breaking a test in gaia-ui-test
Merge inbound to m-c
Merge b2g-inbound to m-c
Merge m-c to inbound