Bug 1028383 - Make ITopLevelProtocol assert to enforce its assumptions that things happen on the main thread - r=bent
Bug 1030446 - Move AsmJSFrameIterator to its own file (r=dougc)

--HG--
extra : rebase_source : b747f42062c1324ebc453151f402903624f33bc5
Bug 1030446 - Change asm.js tests to use setJitCompilerOption instead of looping a bunch (r=bbouvier)

--HG--
extra : rebase_source : 8fb050c73594545d93f59a031629c9d219de60ad
Merge m-c to fx-team a=merge
Bug 1029031 - Rewrite test to use tasks; r=MattN

An upcoming patch will add more code to
browser_urlbar_search_healthreport.js. We now have support for running
tasks in bc tests, so let's use it to make my life easier.

--HG--
extra : rebase_source : 2fbec7c264f7ebaa8b9abd49694ae56c4d74b7c7
extra : amend_source : 551ee4c0e87f42cd44c9b5395278b56dfbc89b90
Bug 1029031 - Record default search provider in FHR; r=bsmedberg, MattN

--HG--
extra : rebase_source : 7e3c2688db567bac8760c405d9e9d7d41e8564d9
extra : amend_source : a5f4264ec947ae27e3036018034e0b17bf1e8590
Bug 1030446 - Store and use exit-fp instead of exit-sp for asm.js stack unwinding (r=dougc)

--HG--
extra : rebase_source : 1c72f7049869064c465dc711f0cab8332ef7dc12
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/d2b5155abc89
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Merge pull request #20501 from sfoster/bug-1023179-tutorial-tests" for Gaia-ui test failures

This reverts commit 82cccd171556baa330a2ae26aaf994987aee19c2, reversing
changes made to bd5888a2c883712d07a058e4600bfa04b8b19af4.
Bumping manifests a=b2g-bump
Backout bcd72aabb661, 1ed1c6212f4c, and 8d6f286139ef (bug 1025998) for xpcshell bustage leading to this CLOSED TREE
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/0d1353fd4363
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #20262 from andrewzhi/bug983393

Bug 983393 - [Clock]After reaching lap 1000,the user is able to add more... r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/431f705d2f08
Author: ad <andrew@workHost.(none)>
Desc: Bug 983393 - [Clock]After reaching lap 1000,the user is able to add more laps by switching between the Stopwatch and Alarm or Timer
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/db6b845afaad
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #20988 from mcav/gelam-epoch

Bug 941991 - [Email] Sync falls into the epoch. r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/d601d98ef45c
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 941991 - [Email] Sync falls into the epoch. r=jrburke
Backed out changeset 8a3fb8fc4d29 (bug 1029781) for android XPCShell failures on a CLOSED TREE
Bumping manifests a=b2g-bump
Bug 1025197 - only clear the "recording hint" when switching to picture mode, r=dhylands
Bug 1028565 - Part 1: Flatten editor/composer/{public,src}/ directories. r=ehsan

--HG--
rename : editor/composer/src/crashtests/351236-1.html => editor/composer/crashtests/351236-1.html
rename : editor/composer/src/crashtests/407062-1.html => editor/composer/crashtests/407062-1.html
rename : editor/composer/src/crashtests/419563-1.xhtml => editor/composer/crashtests/419563-1.xhtml
rename : editor/composer/src/crashtests/428844-1-inner.xhtml => editor/composer/crashtests/428844-1-inner.xhtml
rename : editor/composer/src/crashtests/428844-1.html => editor/composer/crashtests/428844-1.html
rename : editor/composer/src/crashtests/461049-1.html => editor/composer/crashtests/461049-1.html
rename : editor/composer/src/crashtests/crashtests.list => editor/composer/crashtests/crashtests.list
rename : editor/composer/src/crashtests/removing-editable-xslt-inner.xhtml => editor/composer/crashtests/removing-editable-xslt-inner.xhtml
rename : editor/composer/src/crashtests/removing-editable-xslt.html => editor/composer/crashtests/removing-editable-xslt.html
rename : editor/composer/src/nsComposeTxtSrvFilter.cpp => editor/composer/nsComposeTxtSrvFilter.cpp
rename : editor/composer/src/nsComposeTxtSrvFilter.h => editor/composer/nsComposeTxtSrvFilter.h
rename : editor/composer/src/nsComposerCommands.cpp => editor/composer/nsComposerCommands.cpp
rename : editor/composer/src/nsComposerCommands.h => editor/composer/nsComposerCommands.h
rename : editor/composer/src/nsComposerCommandsUpdater.cpp => editor/composer/nsComposerCommandsUpdater.cpp
rename : editor/composer/src/nsComposerCommandsUpdater.h => editor/composer/nsComposerCommandsUpdater.h
rename : editor/composer/src/nsComposerController.cpp => editor/composer/nsComposerController.cpp
rename : editor/composer/src/nsComposerController.h => editor/composer/nsComposerController.h
rename : editor/composer/src/nsComposerDocumentCommands.cpp => editor/composer/nsComposerDocumentCommands.cpp
rename : editor/composer/src/nsComposerRegistration.cpp => editor/composer/nsComposerRegistration.cpp
rename : editor/composer/src/nsEditingSession.cpp => editor/composer/nsEditingSession.cpp
rename : editor/composer/src/nsEditingSession.h => editor/composer/nsEditingSession.h
rename : editor/composer/src/nsEditorSpellCheck.cpp => editor/composer/nsEditorSpellCheck.cpp
rename : editor/composer/src/nsEditorSpellCheck.h => editor/composer/nsEditorSpellCheck.h
rename : editor/composer/public/nsIEditingSession.idl => editor/composer/nsIEditingSession.idl
rename : editor/composer/src/res/EditorOverride.css => editor/composer/res/EditorOverride.css
rename : editor/composer/src/res/grabber.gif => editor/composer/res/grabber.gif
rename : editor/composer/src/res/table-add-column-after-active.gif => editor/composer/res/table-add-column-after-active.gif
rename : editor/composer/src/res/table-add-column-after-hover.gif => editor/composer/res/table-add-column-after-hover.gif
rename : editor/composer/src/res/table-add-column-after.gif => editor/composer/res/table-add-column-after.gif
rename : editor/composer/src/res/table-add-column-before-active.gif => editor/composer/res/table-add-column-before-active.gif
rename : editor/composer/src/res/table-add-column-before-hover.gif => editor/composer/res/table-add-column-before-hover.gif
rename : editor/composer/src/res/table-add-column-before.gif => editor/composer/res/table-add-column-before.gif
rename : editor/composer/src/res/table-add-row-after-active.gif => editor/composer/res/table-add-row-after-active.gif
rename : editor/composer/src/res/table-add-row-after-hover.gif => editor/composer/res/table-add-row-after-hover.gif
rename : editor/composer/src/res/table-add-row-after.gif => editor/composer/res/table-add-row-after.gif
rename : editor/composer/src/res/table-add-row-before-active.gif => editor/composer/res/table-add-row-before-active.gif
rename : editor/composer/src/res/table-add-row-before-hover.gif => editor/composer/res/table-add-row-before-hover.gif
rename : editor/composer/src/res/table-add-row-before.gif => editor/composer/res/table-add-row-before.gif
rename : editor/composer/src/res/table-remove-column-active.gif => editor/composer/res/table-remove-column-active.gif
rename : editor/composer/src/res/table-remove-column-hover.gif => editor/composer/res/table-remove-column-hover.gif
rename : editor/composer/src/res/table-remove-column.gif => editor/composer/res/table-remove-column.gif
rename : editor/composer/src/res/table-remove-row-active.gif => editor/composer/res/table-remove-row-active.gif
rename : editor/composer/src/res/table-remove-row-hover.gif => editor/composer/res/table-remove-row-hover.gif
rename : editor/composer/src/res/table-remove-row.gif => editor/composer/res/table-remove-row.gif
rename : editor/composer/src/res/text_caret.png => editor/composer/res/text_caret.png
rename : editor/composer/src/res/text_caret@1.5x.png => editor/composer/res/text_caret@1.5x.png
rename : editor/composer/src/res/text_caret@2.25x.png => editor/composer/res/text_caret@2.25x.png
rename : editor/composer/src/res/text_caret@2x.png => editor/composer/res/text_caret@2x.png
rename : editor/composer/src/res/text_caret_tilt_left.png => editor/composer/res/text_caret_tilt_left.png
rename : editor/composer/src/res/text_caret_tilt_left@1.5x.png => editor/composer/res/text_caret_tilt_left@1.5x.png
rename : editor/composer/src/res/text_caret_tilt_left@2.25x.png => editor/composer/res/text_caret_tilt_left@2.25x.png
rename : editor/composer/src/res/text_caret_tilt_left@2x.png => editor/composer/res/text_caret_tilt_left@2x.png
rename : editor/composer/src/res/text_caret_tilt_right.png => editor/composer/res/text_caret_tilt_right.png
rename : editor/composer/src/res/text_caret_tilt_right@1.5x.png => editor/composer/res/text_caret_tilt_right@1.5x.png
rename : editor/composer/src/res/text_caret_tilt_right@2.25x.png => editor/composer/res/text_caret_tilt_right@2.25x.png
rename : editor/composer/src/res/text_caret_tilt_right@2x.png => editor/composer/res/text_caret_tilt_right@2x.png
rename : editor/composer/src/res/text_selection_handle.png => editor/composer/res/text_selection_handle.png
rename : editor/composer/src/res/text_selection_handle@1.5.png => editor/composer/res/text_selection_handle@1.5.png
rename : editor/composer/src/res/text_selection_handle@2.png => editor/composer/res/text_selection_handle@2.png
Bug 1028565 - Part 2: Flatten editor/txmgr/{idl,public,src}/ directories. r=ehsan

--HG--
rename : editor/txmgr/idl/nsITransaction.idl => editor/txmgr/nsITransaction.idl
rename : editor/txmgr/idl/nsITransactionList.idl => editor/txmgr/nsITransactionList.idl
rename : editor/txmgr/idl/nsITransactionListener.idl => editor/txmgr/nsITransactionListener.idl
rename : editor/txmgr/idl/nsITransactionManager.idl => editor/txmgr/nsITransactionManager.idl
rename : editor/txmgr/src/nsTransactionItem.cpp => editor/txmgr/nsTransactionItem.cpp
rename : editor/txmgr/src/nsTransactionItem.h => editor/txmgr/nsTransactionItem.h
rename : editor/txmgr/src/nsTransactionList.cpp => editor/txmgr/nsTransactionList.cpp
rename : editor/txmgr/src/nsTransactionList.h => editor/txmgr/nsTransactionList.h
rename : editor/txmgr/src/nsTransactionManager.cpp => editor/txmgr/nsTransactionManager.cpp
rename : editor/txmgr/src/nsTransactionManager.h => editor/txmgr/nsTransactionManager.h
rename : editor/txmgr/public/nsTransactionManagerCID.h => editor/txmgr/nsTransactionManagerCID.h
rename : editor/txmgr/src/nsTransactionManagerFactory.cpp => editor/txmgr/nsTransactionManagerFactory.cpp
rename : editor/txmgr/src/nsTransactionStack.cpp => editor/txmgr/nsTransactionStack.cpp
rename : editor/txmgr/src/nsTransactionStack.h => editor/txmgr/nsTransactionStack.h
Bug 1028565 - Part 3: Flatten editor/txtsvc/{public,src}/ directories. r=ehsan

--HG--
rename : editor/txtsvc/src/nsFilteredContentIterator.cpp => editor/txtsvc/nsFilteredContentIterator.cpp
rename : editor/txtsvc/src/nsFilteredContentIterator.h => editor/txtsvc/nsFilteredContentIterator.h
rename : editor/txtsvc/public/nsIInlineSpellChecker.idl => editor/txtsvc/nsIInlineSpellChecker.idl
rename : editor/txtsvc/public/nsISpellChecker.h => editor/txtsvc/nsISpellChecker.h
rename : editor/txtsvc/public/nsITextService.h => editor/txtsvc/nsITextService.h
rename : editor/txtsvc/public/nsITextServicesDocument.h => editor/txtsvc/nsITextServicesDocument.h
rename : editor/txtsvc/public/nsITextServicesFilter.idl => editor/txtsvc/nsITextServicesFilter.idl
rename : editor/txtsvc/src/nsTSAtomList.h => editor/txtsvc/nsTSAtomList.h
rename : editor/txtsvc/public/nsTextServicesCID.h => editor/txtsvc/nsTextServicesCID.h
rename : editor/txtsvc/src/nsTextServicesDocument.cpp => editor/txtsvc/nsTextServicesDocument.cpp
rename : editor/txtsvc/src/nsTextServicesDocument.h => editor/txtsvc/nsTextServicesDocument.h
rename : editor/txtsvc/src/nsTextServicesFactory.cpp => editor/txtsvc/nsTextServicesFactory.cpp
Bug 1028559 - Flatten xpcom/string/{public,src}/ directories. r=dbaron

--HG--
rename : xpcom/string/public/nsAString.h => xpcom/string/nsAString.h
rename : xpcom/string/public/nsAlgorithm.h => xpcom/string/nsAlgorithm.h
rename : xpcom/string/public/nsCharTraits.h => xpcom/string/nsCharTraits.h
rename : xpcom/string/src/nsDependentString.cpp => xpcom/string/nsDependentString.cpp
rename : xpcom/string/public/nsDependentString.h => xpcom/string/nsDependentString.h
rename : xpcom/string/src/nsDependentSubstring.cpp => xpcom/string/nsDependentSubstring.cpp
rename : xpcom/string/public/nsDependentSubstring.h => xpcom/string/nsDependentSubstring.h
rename : xpcom/string/public/nsEmbedString.h => xpcom/string/nsEmbedString.h
rename : xpcom/string/public/nsLiteralString.h => xpcom/string/nsLiteralString.h
rename : xpcom/string/public/nsPrintfCString.h => xpcom/string/nsPrintfCString.h
rename : xpcom/string/src/nsPromiseFlatString.cpp => xpcom/string/nsPromiseFlatString.cpp
rename : xpcom/string/public/nsPromiseFlatString.h => xpcom/string/nsPromiseFlatString.h
rename : xpcom/string/src/nsReadableUtils.cpp => xpcom/string/nsReadableUtils.cpp
rename : xpcom/string/public/nsReadableUtils.h => xpcom/string/nsReadableUtils.h
rename : xpcom/string/src/nsString.cpp => xpcom/string/nsString.cpp
rename : xpcom/string/public/nsString.h => xpcom/string/nsString.h
rename : xpcom/string/public/nsStringBuffer.h => xpcom/string/nsStringBuffer.h
rename : xpcom/string/src/nsStringComparator.cpp => xpcom/string/nsStringComparator.cpp
rename : xpcom/string/public/nsStringFwd.h => xpcom/string/nsStringFwd.h
rename : xpcom/string/public/nsStringIterator.h => xpcom/string/nsStringIterator.h
rename : xpcom/string/src/nsStringObsolete.cpp => xpcom/string/nsStringObsolete.cpp
rename : xpcom/string/src/nsSubstring.cpp => xpcom/string/nsSubstring.cpp
rename : xpcom/string/public/nsSubstring.h => xpcom/string/nsSubstring.h
rename : xpcom/string/src/nsSubstringTuple.cpp => xpcom/string/nsSubstringTuple.cpp
rename : xpcom/string/public/nsSubstringTuple.h => xpcom/string/nsSubstringTuple.h
rename : xpcom/string/src/nsTDependentString.cpp => xpcom/string/nsTDependentString.cpp
rename : xpcom/string/public/nsTDependentString.h => xpcom/string/nsTDependentString.h
rename : xpcom/string/src/nsTDependentSubstring.cpp => xpcom/string/nsTDependentSubstring.cpp
rename : xpcom/string/public/nsTDependentSubstring.h => xpcom/string/nsTDependentSubstring.h
rename : xpcom/string/public/nsTLiteralString.h => xpcom/string/nsTLiteralString.h
rename : xpcom/string/src/nsTPromiseFlatString.cpp => xpcom/string/nsTPromiseFlatString.cpp
rename : xpcom/string/public/nsTPromiseFlatString.h => xpcom/string/nsTPromiseFlatString.h
rename : xpcom/string/src/nsTString.cpp => xpcom/string/nsTString.cpp
rename : xpcom/string/public/nsTString.h => xpcom/string/nsTString.h
rename : xpcom/string/src/nsTStringComparator.cpp => xpcom/string/nsTStringComparator.cpp
rename : xpcom/string/src/nsTStringObsolete.cpp => xpcom/string/nsTStringObsolete.cpp
rename : xpcom/string/src/nsTSubstring.cpp => xpcom/string/nsTSubstring.cpp
rename : xpcom/string/public/nsTSubstring.h => xpcom/string/nsTSubstring.h
rename : xpcom/string/src/nsTSubstringTuple.cpp => xpcom/string/nsTSubstringTuple.cpp
rename : xpcom/string/public/nsTSubstringTuple.h => xpcom/string/nsTSubstringTuple.h
rename : xpcom/string/public/nsUTF8Utils.h => xpcom/string/nsUTF8Utils.h
rename : xpcom/string/src/nsUTF8UtilsSSE2.cpp => xpcom/string/nsUTF8UtilsSSE2.cpp
rename : xpcom/string/public/nsXPCOMStrings.h => xpcom/string/nsXPCOMStrings.h
rename : xpcom/string/public/nsXPIDLString.h => xpcom/string/nsXPIDLString.h
rename : xpcom/string/public/string-template-def-char.h => xpcom/string/string-template-def-char.h
rename : xpcom/string/public/string-template-def-unichar.h => xpcom/string/string-template-def-unichar.h
rename : xpcom/string/public/string-template-undef.h => xpcom/string/string-template-undef.h