Bug 1024289: Part 0a: remove unnecessary use of autoboxing from testBrowserProvider. r=rnewman
Bug 1024289 - Part 0b: fix cursor closing in testBrowserProvider. r=trivial
Bug 1035164 - fix nullcheck in CustomizableWidgets, remove warning for items without shortcut in subviews, r=jaws

--HG--
extra : rebase_source : 0b58d1d43a877f8776ac99fe20dda9c4495c4643
Bug 1035211 - don't call acceptDialog for privacy pane private browsing change in in-content prefs, r=jaws

--HG--
extra : rebase_source : cde84a8a08de69f205b1572d85f270c28b6de56f
Bug 1027287 - Prevent non-local network connection to aus when enabling app update in add-ons mgr hotfix test. r=mossop
Bug 1024289 - Part 0c: follow-up to fix bustage. r=trivial
Bug 1003610 - Remote Tabs shouldn't lose scroll position, r=nalexander
Bug 1033168 - GeckoView needs to use EventDispatcher.sendResponse r=wesj
Bug 959379 - 192x192 app icon for Fennec. DONTBUILD, r=none, assets only.
Bug 965697 - Fix intermittent browser_sessionHistory.js failures by waiting until the history entry has been replaced. r=smacleod

--HG--
extra : rebase_source : 2c134be33a3ba6e4916d8645eb662141eb1ecbfa
Bug 1030757 - Don't list closed private tabs in Recent Tabs panel. r=mfinkle
Bug 1024289: Part 1: remove redundant subquery from combined view and add upgrade path. r=rnewman
Bug 1024289: Part 2: remove redundant null checks from combined view. r=rnewman
Bug 1024289: Part 3: remove display column from combined view. r=rnewman
Bug 1030113 - Regression: Menu breaks on Firefox 29+ on tablets with hardware menu. r=mfinkle
Merge m-c to fx-team
Bug 1035329 - Uplift Add-on SDK to Firefox r=me
Bug 1033836 - Rename services-common to services/common; rs=rnewman

The upcoming build system patches don't support hypthens in path names.
Changing this for that reason is kind of silly, but it's the easiest
way. Besides, nothing else uses hyphens in directory names.

--HG--
extra : rebase_source : 42dda2b1f16a3c0bfe17397a70092362e400530f
Bug 1033836 - Support TESTING_JS_MODULES in moz.build; r=glandium

--HG--
extra : rebase_source : 383acfd70fc4f95f6fd5f90490048233a31d9e62
Bug 1033836 - Convert TESTING_JS_MODULES to moz.build; r=glandium

--HG--
extra : rebase_source : 1cd9e402c507260358af7a93c6fb2fc91c24994b