Tags: veeti/gaia

Merge pull request mozilla-b2g#19982 from jmcanterafonseca/duplicate_…

…count

Bug 977528 - [Contacts][Feature] Importers should give information of au...

Merge pull request mozilla-b2g#19547 from Rik/1.4-call-log-single-sim…

…-slot-2-1014043

Bug 1014043 - Fail to call from Call log and error message is 'Airplane ... r=etienne

Merge pull request mozilla-b2g#19374 from mnjul/bug_1011645_lockscree…

…n_passcode_camera_button_stall_v1.3

Bug 1011645 - [B2G][Lockscreen] When unlocking a phone with a passcode, the user will see a blank homescreen with no apps - v1.3

Bug 994176 - Create branched versions of marionette-client and consum…

…er packages. r=bsilverberg

Merge pull request mozilla-b2g#18732 from jaoo/998914-v1.3

Bug 998914 - [v1.3][Settings] Cannot preselect the APN correctly if ther...

Merge pull request mozilla-b2g#18736 from alivedise/bugzilla/1002316_…

…v1.3t_real/sound-manager-home-event

Bug 1002316 - Homescreen event should be caught by sound manager, r=timdream

Merge pull request mozilla-b2g#18602 from jimporter/music-update-hidd…

…en-scrubber

Bug 1000214 - [music] Update progress bar when display is suspended and ...
Conflicts:
	apps/music/test/marionette/Player_test.js

Merge pull request mozilla-b2g#17209 from mikeaich/bug975513_2

Bug 975513 - explicitly add/remove 'devicemotion' event listeners on Camera app focus/blur, r=jdarcangelo

Merge pull request mozilla-b2g#17231 from dominickuo/v1.3-bug-958470-new

Bug 958470 - [Ringtones] set ringer type to the ringtones player, r=jimporter

Revert "Merge pull request mozilla-b2g#16461 from gittup/bug-917630"

This reverts commit 0576cd3, reversing
changes made to c5cb252.