Bug 924233 - Fixing a test failure when TelephonyHelperTest was run
alone.
Bug 924233 - Fix broken unit test in system
Bug 915975 - Turn on screen whenever its turned off by proximity
Bug 924955 - Enable tests for Hamachi device
Bug 922703 - Refine the error handler for card lock functionality
Bug 910584 - Plugging headphones in during a call should turn off the
speaker if it's on.
r=Rik
Merge pull request #12727 from etiennesegonzac/bug-924233-dialer-part

Bug 924233 - Fixing a test failure when TelephonyHelperTest was run alone. r=Rik
Merge pull request #12728 from alivedise/bugzilla/924233_master/bm_test_fail

Bug 924233 - Fix Battery manager unit test r=etienne
Bug 924903 - [Contacts] Custom tag for mobile, email an address can be edited but it is not saved
Bug 924553 - Remove redundant string match on mozapptype
Merge pull request #12749 from etiennesegonzac/bug-910584-dialer-headset-and-speaker

Bug 910584 - Plugging headphones in during a call should turn off the speaker if it's on. r=Rik
Bug 925602 - [B2G][Contacts] No error message is given when a loss of data connection occurs while importing Gmail contacts
Merge pull request #12787 from gtorodelvalle/contacts-bug-924903-custom-tag-reloaded

Bug 924903 - [Contacts] Custom tag for mobile, email an address can be edited but it is not saved
Merge pull request #12731 from alivedise/bugzilla/924553/mozapptype-match

Bug 924553 - Remove redundant string match, r=timdream
Merge pull request #12740 from alivedise/bugzilla/915975/proximity-toggle

Bug 915975 - Turn on screen whenever its turned off by proximity, r=timdream
Merge pull request #12788 from jmcanterafonseca/fix_fb_dialog

Bug 925602 - [B2G][Contacts] No error message is given when a loss of da...
Bug 925677 - Xfali test_camera_multiple, test_add_photo_to_contact, test_gallery_edit_photo
Merge pull request #12760 from zacc/bug924955

Bug 924955 - Enable tests for Hamachi device
Merge pull request #12791 from zacc/bug925677

Bug 925677 - Xfali test_camera_multiple, test_add_photo_to_contact, test...
Bug 914999 - Mobile phone is not well-formed on vcard export