Bug 915506 - ensure AeroPeek is fully disabled with e10s.  r=dao
Bug 896557 - Split testWebContentContextMenu to make it more reliable (r=margaret)
Merge mozilla-central and fx-team
Bug 914829 - MetroInput should forward touch input to apz first, then to content. r=kats, tabraldes
Bug 908244 - When a download is launched automatically, the target file should be deleted when the browser is closed. r=paolo
Bug 908246 - Private downloads should be finalized when the last private browsing window is closed. r=paolo
Bug 902587 - Part 1: Refactor IO Interposer with filename support. r=aklotz
Bug 909107 - Replace use of (obsolete) strres.js in test_bug292789.html. r=dveditz
Bug 855523 - Markup-view lines are easier to expand/collapse. r=miker

New markup structure for the markup-view inspector.
This allows for tags to have a full edge-to-edge line.
So highlight and click areas are easier to use.
Bug 894990 - Expose mochitest data file URL via SimpleTest.getTestFileURL. r=jmaher
Bug 888326 - Part 1: Move the favicons class into its own package and, while we're at it, get rid of unused imports in the touched files. r=mleibovic

--HG--
rename : mobile/android/base/Favicons.java => mobile/android/base/favicons/Favicons.java
Bug 888326 - Part 2: Refactoring Favicons to be static, not a singleton - the singleton instance was staticly assigned and never cleared. r=mleibovic
Bug 888326 - Part 3: Factor the inner classes of Favicon into their own files. r=mleibovic
Bug 888326 - Part 4: LoadFaviconTask's use mNextFaviconLoadId is now thread safe. (Use AtomicInteger instead of long.) r=mleibovic
Bug 888326 - Part 5: Make the FaviconView able to resize strangely sized inputs to more appropriate sizes, if enabled. r=mleibovic
Bug 888326 - Part 6: Prevent a corrupted Favicon from causing us possibly to leak an unclosed InputStream. r=mleibovic
Bug 902587 - Part 1 follow-up: Remove include of deleted file.
Bug 907734 - Create the DataBaseHelper and StringHelper classes. r=margaret
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/205a25331421
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12143 from lightsofapollo/revert-lint-failure

Revert "Merge pull request #11864 from gabrielesvelto/bug-887156-wappush...

========

https://hg.mozilla.org/integration/gaia-central/rev/986035b2d4ca
Author: James Lal <james@lightsofapollo.com>
Desc: Revert "Merge pull request #11864 from gabrielesvelto/bug-887156-wappush-whitelist"

This reverts commit a7f11d14d1fa7988fa429fa87572e0072bf3c1a1, reversing
changes made to f418a83a9b6fbf55a09dab86a91bb6262dc78fb9.
Bug 915260 - "TypeError: Services.settings is undefined" error in B2G mochitest logs r=etienne