Bug 1040906 - Follow-up to e6a2c46ad0b5 because I missed a callsite and broke some builds. r=me on a CLOSED TREE
Backed out changeset 749816a9c3fb (bug 1020416) for causing merge conflicts on a CLOSED TREE
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/67f0bdcac540
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #22031 from KevinGrandon/bug_1041993_fix_homescreen_geolocation

Bug 1041993 - Keyboard JS marionette test failure: Show Keyboard App after uninstallation

========

https://hg.mozilla.org/integration/gaia-central/rev/0a10af0873c8
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1041993 - Keyboard JS marionette test failure: Show Keyboard App after uninstallation r=amirn
Bumping manifests a=b2g-bump
Bumping gaia.json for 8 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/383735049e86
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #21846 from svic/Bug_1039239

Bug 1039239 - Better NFC handover error handling

========

https://hg.mozilla.org/integration/gaia-central/rev/b40b6117be3e
Author: Arno Puder <arno@puder.org>
Desc: Bug 1039239 - Better NFC handover error handling

========

https://hg.mozilla.org/integration/gaia-central/rev/8eba7c0e50e3
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #21837 from guilherme-pg/bug1034088-offline

Bug 1034088 - Display the proper Settings panel for Find My Device when offline.

========

https://hg.mozilla.org/integration/gaia-central/rev/a57845e709a3
Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
Desc: Bug 1034088 - Display the proper Settings panel for Find My Device when offline.

========

https://hg.mozilla.org/integration/gaia-central/rev/627a576d2058
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #21688 from flodolo/bug892700

Bug 892700 - Display Developer options on 2 lines if necessary

========

https://hg.mozilla.org/integration/gaia-central/rev/d6fe3b318ec0
Author: Francesco Lodolo (:flod) <flod@lodolo.net>
Desc: Bug 892700 - Display Developer options on 2 lines if necessary

========

https://hg.mozilla.org/integration/gaia-central/rev/70edf8c17539
Author: Andrew Halberstadt <halbersa@gmail.com>
Desc: Merge pull request #21888 from ahal/python_service

Create a python runner service to run integration tests on device

========

https://hg.mozilla.org/integration/gaia-central/rev/ff1e44c2f817
Author: Andrew Halberstadt <halbersa@gmail.com>
Desc: Bug 994847 - Create a python runner service for integration tests, r=mdas
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/eb5962f388ec
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #22000 from guilherme-pg/bug1041591-can-disable-logout

Bug 1041591 - Don't set 'findmydevice.can-disable' if not registered on ...

========

https://hg.mozilla.org/integration/gaia-central/rev/c3662fd49610
Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
Desc: Bug 1041591 - Don't set 'findmydevice.can-disable' if not registered on logout.
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/367d4c20ee23
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Merge pull request #21919 from pacorampas/1030623

 Bug 1030623 - [Dialer] No space between text and border when Contact with long name and number matching hits

========

https://hg.mozilla.org/integration/gaia-central/rev/0c3dec6ee08b
Author: Paco Rampas <pacorampas@gmail.com>
Desc: Bug 1030623 - [Dialer] No space between text and border when Contact with long name and number matching hits
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/3137a95a6483
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Merge pull request #21445 from pacorampas/1033937

Bug 1033937 - [Calllog] Tap on Withheld number in call log, item highlighted, but stay highlighted when finger released

========

https://hg.mozilla.org/integration/gaia-central/rev/acd6bf877dbe
Author: Paco Rampas <pacorampas@gmail.com>
Desc: Bug 1033937 - [Calllog] Tap on Withheld number in call log, item highlighted, but stay highlighted when finger released
Bumping manifests a=b2g-bump
Bug 984711 followup: Touch CLOBBER because apparently something here requires it.
CLOSED TREE, DONTBUILD
Merge latest green inbound changeset and mozilla-central; a=merge
Merge latest green b2g-inbound changeset and mozilla-central; a=merge
Merge mozilla-central and inbound
Merge mozilla-central and fx-team
Merge mozilla-central and b2g-inbound
Bug 1041149 - Remove unused variable in generateScreenshotFor in canvas.js, r=past
Bug 1041157 - Add link to the discussion about using the same context with multiple canvases, for the replayAnimationFrame function in canvas.js, r=past