Bug 971626 - [Australis] Restore Defaults should collapse Title Bar. r=Gijs
Bug 958111 - "Find in Page" on Android should zoom in on the highlighted result. r=margaret
Bug 958111 - Disable assertion in testFindInPage. r=gbrown
Bug 935264 - Add more test cases to testHomeBanner (and update it to use UITest). r=mcomella
Bug 947550 - Wait for Gecko:DelayedStartup in testAboutHomePageNavigation. r=margaret
Bug 972846 - There's a redundant teardown call in the last testParamsTab function in browser_net_complex-params.js, r=me
Bug 859136 - Requests with an image response should display a thumbnail near the file name, r=rcampbell
Bug 859135 - Hovering over a request with an image response should show a popup displaying that image, r=rcampbell
Bug 971939 - Combine all FileResultHandlers into one [r=lucasr]
Bug 971939 - Rename FilePickresulthandler to avoid confusion [r=lucasr]
Bug 971939 - Use native Android intent chooser for FilePicker [r=lucasr]
Bug 971626 - Followup, update CSS ID reference for customization-undo-reset-button. r=me

--HG--
extra : rebase_source : a951328c65ba80d2eee20829c58600babfd8b32e
Bug 970506 - Break up FilePicker and ActivityHandlerHelper. r=lucasr

--HG--
rename : mobile/android/base/ActivityHandlerHelper.java => mobile/android/base/FilePicker.java
Bug 972485 - [Australis] Replace aboutCustomizing.xhtml with aboutCustomizing.xul to avoid some sync IO on load. r=Gijs.
Merge m-c to fx-team.
Bug 968908 - PromptInputs should return an Object not a String. r=wesj
Bug 972093 - Detect run_next_test() during add_task(); r=ted, rnewman

If an xpcshell test called run_next_test() from inside an add_task(),
bad things would happen. This patch detects that behavior and aborts the
test immediately with an actionable error message.

--HG--
extra : rebase_source : c5cf11070421b95a6fcf476d0a86289a3d0ba73a
extra : amend_source : cec6ad2a751bba01e7d4ecbff0735b39e3326efb
Bug 966678 - Australis' customize mode's "Restore defaults" button disabled styling isn't obvious. r=mconley
Bug 939080 - Allow support-files in manifests to exist in parent paths; r=ted

--HG--
extra : rebase_source : 0e5f6ecb13b38453e5590cc28503ddab8df5144d
Bug 953272: Add selected attribute for prompts with multichoice. r=wesj