Bug 945649 - [DSDS][MMS] Switching data call message is wrong when try to switch data call to SIM 2
Revert "Merge pull request #13989 from ian-liu/settings/Bug926334_To_support_EAP-SIM_and_WPA-EAP_option_in_WLAN_settin"

This reverts commit 7c568287adbf97e3b1454512f0028ec273467bd1, reversing
changes made to 22f7ea4e7fa50d16834b838f3c356ca86810db24.

This is breaking test_settings_do_not_track.TestSettingsDoNotTrack.test_enable_do_not_track_via_settings_app
Merge pull request #14434 from evanxd/bug-945611

Bug 945611 - Run marionette tests for a specific app.
Merge pull request #14442 from steveck-chung/DSDS-sim_switch_for_MMS

Bug 945649 - [DSDS][MMS] Switching data call message is wrong when try to switch data call to SIM 2. r=julienw
[Bug 946614] - [Email] Div Lines too dark
Bug 916850: Skip multi-page Ogg meta data

Ogg files are split into multiple segments, called pages. Currently
we only support meta data in a single page. This can result in parser
errors when meta data fields span multiple pages, and the inability
to listen to the Ogg file.

With this patch, the parser simply stops in these cases. We don't get
the respective information from the file, but the file will at least
be available for playing in the Music player.

Signed-off-by: Thomas Zimmermann <tdz@users.sourceforge.net>
Bug 940294 - [Download Manager] Implement the flow when the user opens a file and this action fails from notifications
Merge pull request #14393 from viorelaioia/bug_945261

Bug 945261 - [v1.2] Investigate intermittent fail in test_cards_view_launch_app.py
Revert "Bug 945261 - [v1.2] Investigate intermittent fail in test_cards_view_launch_app.py"

This reverts commit 2ec0ab380aefd59765859d6bf1129c54699eab74.
Bug 946250 - When settings is invoked from messaging and closed from home button it does not recover its original status
Bug 947204: Push user.js file using full path.
Bug 915156 - Port the test-perf to node with the new marionette-client.
Bug 915156 - Part 2: finish it.

Add a 'requireGaia()'

Fix gjslint error (whitespace)

Revert some change on how we get the defaultCallback.

Remove unused code block.

This follow Bug 915158 - Allow setting a marionette runner host at runtime.

Re-add the performance reporter for Mocha.

Fix the screen unlock

Rename PerfApp to PerfTestApp.

Support entry point for launching apps.

introduce gaia-perf-marionette to perform the loop and only do npm once.
also skip profile building unless we run b2gdesktop

Really exit on excluded apps

gjslint whitespace fixes

Fix PerformanceHelper.delay()

re-implement "element" for the PerfApp helper.

Fix test iteration

Add "setringtones" to the exclusion list.

Check whitelist earlier in the tests

Get the event source - This replaces PR #13752

Pass the test data to the reporter.

Fix the marionette action.

Finally the rendering test work
Bug 915156 - Part 3 - more cleanups

Move perf.js to tests/performance

Small cleanup variables and such post review.

Remove useless comment

Fix linter errors

fix details in test to be more test-ish
split out the integration to a separate app specific file

Move some non performance marionette stuff to a helper.

Move unlock screen to the helper.

Remove extraneous console.log

Fix linter issue

Get the RUNS env for number of runs

Make sure to reset mozPerfDurations for each test.

Fix perf event observer
Bug 915156 - Part 4 - more cleanups / review / feedback

untabify

Add missing ;

Use a "constant" for the helper atom object

Rename write() to json_proxy_write() to avoid confusion until bug 944494 is fixed.

mozPerfDurations was persisted between run. All we do is collect
and report.

Missing > in the test title.
Bug 915156 - Part 5: Fix nits.
Bug 946678 - [Messaging] Creating a new message from contacts does not open the messaging composer when Messaging app is in background r=borja

Adds a hash for the "new" activity. This will have the side-effect of not
registering the notification and sms-received system message handlers which is a
good thing.
Bug 946666 - Write a test for wakelock
Merge pull request #13497 from hfiguiere/node-switch-over

Bug 915156 - make test-perf work again. r=jwajsberg,jlal
Merge pull request #14414 from arcturus/bug-940294

Bug 940294 - [Download Manager] Implement the flow when the user opens a file and this action fails from notifications