Bug 1001856 - [settings] remove unused localization strings from Firefox OS 2.0
Bug 997601 - Save the caller id preferece across reboots
Bug 999506 - Detect the device_root before pushing/clearing files from the device, remove hardcoded references to /sdcard
Bug 1001883 - [costcontrol remove unused localizations strings from Firefox OS 2.0
Bug 1002339 - [Stingray] layout editor for stingray
Bug 1005918 - [FTU-Separation] Move import tests to contacts/test/unit/import
Merge branch 'master' into settings-stringRemoval
Bug 1006469 - Fix test_cards_view_with_two_apps.py, flicks in wrong direction
Bug 1007561 - Using local http server to test distribution mechanism
Merge pull request #18408 from crh0716/997601

Bug 997601 - Save the caller id preferece across reboots r=jaoo
Bug 1001901 - [ftu] remove unused localization strings from Firefox OS 2.0
Merge pull request #19052 from Archaeopteryx/costcontrol-stringRemoval

Bug 1001883 - [costcontrol remove unused localizations strings from Firefox OS 2.0. r=salva
Bug 1003774 - [FTU-Separation] Move local oauth redirect files
Merge pull request #18946 from jmcanterafonseca/move_import_tests2

Bug 1005918 - [FTU-Separation] Move import tests to contacts/test/unit/i...
Merge pull request #18932 from huchengtw-moz/Stingray/Bug_1002339-layout-editor

Bug 1002339 - [Stingray] layout editor for stingray, r=garychen, r=lchang
Merge pull request #19053 from yurenju/twitter

Bug 1007561 - Using local http server to test distribution mechanism
Bug 1000599 - Use the new & fixed mozL10n.ready in Settings. r=arthur
Merge pull request #18941 from jmcanterafonseca/move_redirects2

Bug 1003774 - [FTU-Separation] Move local oauth redirect files
Merge pull request #18987 from AndreiH/bug_1006469

Bug 1006469 - Fix test_cards_view_with_two_apps.py, flicks in wrong dire...
 Bug 1007628 - [Follow up] [BB] Buttons: update list button to new specs