Bug-951287 Multiline quoted encoding elemnets in vcard files
Xfail test_sms_with_attachments with the new bug
Bug 961039 - Xfail test_cost_control_data_alert_mobile
Bug 934583 - The phone number is highlighted in red not orange when initiating a call from the call log
Bug 961568 - Fix intermittent failure of test_settings_airplane_mode.py
Bug 957497 - Allow include of uncompressed data files in the package apps
Merge pull request #15450 from yurenju/no-compression

Bug 957497 - Allow include of uncompressed data files in the package apps r=@timdream
Bug 961579 - Fix intermittent failure of test_camera_capture_video and test_camera_capture_photo
Bug 881957 - Implement toast and show toast after successfully change PIN
Merge pull request #15464 from viorelaioia/bug_961039

Bug 961039 - Xfail test_cost_control_data_alert_mobile
Merge pull request #13685 from dwi2/bug881957

Bug 881957 - Implement toast and show toast after successfully change PIN
Merge branch 'master' of git://github.com/mozilla-b2g/gaia into issue-958440

Conflicts:
	build/test/integration/multilocale.test.js
	build/webapp-zip.js
Merge pull request #15468 from Rik/orange-contact-934583

Bug 934583 - The phone number is highlighted in red not orange when init... r=arcturus
Merge pull request #15510 from askeing/961568

Bug 961568 - Fix intermittent failure of test_settings_airplane_mode.py
Merge pull request #15511 from askeing/961579

Bug 961579 - Fix intermittent failure of test_camera_capture_video and ...
Merge pull request #15412 from viorelaioia/bug_960526

Xfail test_sms_with_attachments with Bug 960537 as Bug 958555 was fixed
Merge pull request #15169 from arcturus/bug-935626

Bug-951287 Multiline quoted encoding elemnets in vcard files
Bug 949225 - Check the mozMobileConnection in a DSDS compatible way in TelephonyHelper.
r=rik
Merge pull request #15475 from etiennesegonzac/bug-949225-dsds-conn-check

Bug 949225 - Check the mozMobileConnection in a DSDS compatible way in TelephonyHelper. r=rik
Merge branch 'master' of git://github.com/mozilla-b2g/gaia into issue-958440