Bug 1001817 - [email] remove unused localization strings from Firefox OS 2.0
Bug 998488 - STK PLAY_TONE feature broken r=fcampo

- Access _iccManager from icc instead of iccManager

- Add test case for PLAY_TONE

Change-Id: I701dec50e81fd25357552e33e2a00e4abd28b35d
Bug 1001510 - [Camera] 1.4 Sub menu headers and active Options button positions are off
Bug 996766 - [Camera][Mozilla] 1.4 Visual Design - Make Camera Settings Highlight State 30% Transparent
Bug 1004505 - Avoid double-quoting variables, resulting in invalid JSON. r=timdream
Merge pull request #18707 from Archaeopteryx/email-stringRemoval

Bug 1001817 - [email] remove unused localization strings from Firefox OS 2.0. r=jrburke, r=asuth
Bug 985237 - Disable jspinyin_test from TBPL
Merge pull request #18868 from staktrace/flashfix

Bug 1004505 - Avoid double-quoting variables, resulting in invalid JSON,  r=timdream
Bug 996291 - mozL10n bootstrap code cleanup in Calendar; r=kgrandon
Merge pull request #18498 from zbraniecki/996291-use-mozl10n-once-in-cal

Bug 996291 - mozL10n bootstrap code cleanup in Calendar. r=kgrandon
Bug 1003752 - [VR][Contacts] Select all and Deselect all buttons shouldnt appear in Delete contacts screen
Merge pull request #18878 from crdlc/bug-1003752-v2

Bug 1003752 - [VR][Contacts] Select all and Deselect all buttons shouldn...
Bug 1004963 - Update camera tests
Merge pull request #18862 from wilsonpage/996766

Bug 996766 - [Camera][Mozilla] 1.4 Visual Design - Make Camera Settings
Merge pull request #18861 from wilsonpage/1001510

Bug 1001510 - [Camera] 1.4 Sub menu headers and active Options button
Merge pull request #18463 from nsarkar/bug998488

Bug 998488 - STK PLAY_TONE feature broken r=etienne
Merge pull request #18885 from chirarobert/1004963

Bug 1004963 - Update camera tests
Bug 1002541 - Update marionette_client to 0.7.7
Bug 1003784 - Separate out FakeUpdateChecker.check_updates() and start_b2g(). r=zcampbell
Bug 1003853 - Add comment for marionette.instance and restart