Bug 987354 - Migrate today_test.js to use new view code
Bug 989467 - [Camera][Mozilla] 1.4 Video record button square is too rounded
Bug 990148 - [Calendar] increase specificity of Day View events selector on marionette tests
Bug 971135 - [Clock] Port all Clock integration tests from Python to JavaScript. r=millermedeiros
Merge pull request #17826 from millermedeiros/990148-day-view-event-specificity

Bug 990148 - [Calendar] increase specificity of Day View events selector on marionette tests r=gaye
Merge pull request #17772 from gaye/bug-987354

Bug 987354 - Migrate today_test.js to use new view code r=millermedeiros
Bug 990235 - [Clock] Localize alarm panel.
Merge pull request #17828 from mcav/reland-integration-tests

Bug 971135 - [Clock] Port all Clock integration tests from Python to Jav...
Merge pull request #17830 from eeejay/bug-990235

Bug 990235 - [Clock] Localize alarm panel. r=mcav
Bug 939197 - [Clock] Alarms need volume control. r=millermedeiros
Merge pull request #17825 from wilsonpage/bug/989467

Bug 989467 - [Camera][Mozilla] 1.4 Video record button square is too rou...
Merge pull request #17819 from wilsonpage/bug/987058

Bug 987058 - [Camera] Expose higher resolution recorder profiles
Bug 990285 - [Camera] Resolutions should not be shown in settings menu
Merge pull request #17833 from wilsonpage/bug/990285

Bug 990285 - [Camera] Resolutions should not be shown in settings menu
Bug 974725: [B2G][NFC] Support different vcard mime types for Contacts r=alive
Bug 937442 - (lockscreen-window) [Window Management] Implement LockscreenWindow to manage LockScreen.

Conflicts:
	apps/system/js/lockscreen.js
	apps/system/test/unit/bootstrap_test.js
	tests/python/gaia-ui-tests/gaiatest/tests/functional/lockscreen/test_lockscreen_unlock_to_emergency_call_screen.py
Bug 990334 - [Calendar] Disable marionette test, marionette/today_test.js
Bug 971554 - [System2] Instantiable SoundManager, r=alive
Merge pull request #16398 from dominickuo/bug-973831

Bug 973831 - [Music] also check MusicComms.enabled when checking SCO status, r=jimporter
Merge pull request #17835 from snowmantw/issue937442-lockscreen-window

Bug 937442 - (lockscreen-window) [Window Management] Implement LockscreenWindow to manage LockScreen.