Bumping manifests a=b2g-bump
Backed out changeset 65338f03492b (bug 990065) and changeset 8c3b772518f2 (bug 990057) for B2G desktop mochitest failures.
CLOSED TREE
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/5c11d9d12c55
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Merge pull request #17730 from justindarc/bug988610

Bug 988610 - [Camera][Madai] Black screen when opening camera from locks...

========

https://hg.mozilla.org/integration/gaia-central/rev/01db4a9a2a06
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 988610 - [Camera][Madai] Black screen when opening camera from lockscreen and camera app isn't open
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/934fbbe46bdb
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 978553 - Don't try to insert the message body if the activity didn't populate it r=julienw
Bumping manifests a=b2g-bump
Backed out changeset 7c60268706f3 (bug 956332) for xperf regressions.

--HG--
rename : toolkit/components/passwordmgr/test/unit/test_storage_mozStorage.js => toolkit/components/passwordmgr/test/unit/test_storage_mozStorage_migrate.js
rename : toolkit/components/passwordmgr/test/unit/test_notifications.js => toolkit/components/passwordmgr/test/unit/test_storage_mozStorage_notify.js
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/abf22f65abbe
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Merge pull request #17855 from justindarc/bug990653

Bug 990653 - [Camera] Update unit tests for Activities

========

https://hg.mozilla.org/integration/gaia-central/rev/8d2fc9839025
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 990653 - [Camera] Update unit tests for Activities
Bumping manifests a=b2g-bump
Bug 971093 - Intermittent testSettingsMenuItems | Exception caught - junit.framework.AssertionFailedError: Text string: '^Customize$' is not found! r=gbrown
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/672459abdd64
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge pull request #17810 from gitmai/bug-987142-CC-jshint-fix-2"

This reverts commit 53cdd2b2d8d820d242d3fbccb32c73fb2c9515b0, reversing
changes made to 047855a5e077e9931a864cc2fe802eb42991826b.
Bumping manifests a=b2g-bump
backout f1a7f2af1dce (Bug 981852) because its no longer needed. r=backout
Bug 831593 - Updater/uninstaller helper.exe deletes Firefox AppCompatFlags registry entry during upgrade. r=bbondy
Merge fx-team to m-c.
Merge inbound to m-c.
Merge m-c to fx-team.
Bug 983350 - Follow-up: Rev User-Agent string. r=rnewman
Fix merge bustage between changeset c8be375e0c41 (bug 988111) and changeset 8560fc7e2849 (bug 984269), merged (I think) in changeset 0ff6afce0133, on a CLOSED TREE.
Bug 990680 - Remove extras from GlobalSession constructor. r=rnewman