Bug 978031 - Incorrect message after trying to use dialer in Airplane mode
Bug 980332 - Infinite loop in apps/system/js/devtools_view.js. r=janx
Merge pull request #16916 from Rik/promise-error-978031

Bug 978031 - Incorrect message after trying to use dialer in Airplane mo... r=etienne
Merge pull request #17036 from jankeromnes/appwindow

Bug 980332 - Infinite loop in apps/system/js/devtools_view.js. r=janx
Bug 946866 - [DSDS][Settings] Refactor SimSettingsHelper and SIM card constants into shared code.
Bug 946866 - [DSDS][SMS] Add headerL10n{Id,Args}, item.append to OptionMenu + tests.
Bug 946866 - [DSDS][SMS] Refactor OptionMenu from SMS app to shared code.
Bug 946866 - [DSDS][Dialer] On-the-fly SIM change when calling.
Bug 946866 - [DSDS][Dialer] Add tests for SimPicker and CallButton.
Make MockCallButton.makeCall not actually do anything and get associated tests to pass.
Fix some linting problems.
Move from OptionMenu to an internal menu implementation in SimPicker.
Add tests for CallButton initialization within keypad_test.
Fix some linting issues.
Fix some code review issues.
Move lastCalled setting in MockKeypadManager from updatePhoneNumber to makeCall.
Add a test for cardIndex to telephony_helper_test.
Fix more code review comments.
Revert "Bug 946866 - [DSDS][SMS] Add headerL10n{Id,Args}, item.append to OptionMenu + tests."

This reverts commit 3b02426c65897d91a4b5bd83a579bd93488e0f28.
Revert "Bug 946866 - [DSDS][SMS] Refactor OptionMenu from SMS app to shared code."

This reverts commit cf3039f17fc6d16d40979497bef3c0dd2de36c80.