Bug 836654 - Put the expecting-system-message and mozapptype=critical attributes on frames.
Bug 836654 - Take the 'high-priority' wake-lock in the dialier so the dialer doesn't get killed while we're on a call.
Bug 837236 - share video decoding hardware among Camera, Gallery and Video r=daleharvey

part 1: make camera save a poster image for videos

part 2: remove videodb from gallery app

part 3: update Gallery metadata parser to use video poster images

part 4: modify media_frame and video_player to use a poster image

part 5: update camera to use new media_frame api

part 6: modify Video to release video hardware when it changes visibility

part 7: defer Video metadata parsing so Camera has time to create poster image

part 8: give Gallery permission to use the hardware video decoder

part 9: modify Video to delete poster image when deleting video
Merge pull request #8140 from davidflanagan/bug837236

Bug 837236 - share video decoding hardware among Camera, Gallery and Video r=daleharvey a=tef+
Merge pull request #8143 from jlebar/process-priority-fixes

Bug 836654 - Process priority fixes
Bug 841082 - [Contacts] The "sort by last name" switcher is not initialised correctly [r=jmcanterafonseca]
Merge pull request #8163 from crdlc/bug-841082

Bug 841082 - [Contacts] The "sort by last name" switcher is not initiali...
Bug 842249 - FTU is not checking properly if Facebook is enabled or not
Merge pull request #8165 from jmcanterafonseca/fix_ftu_fb_config

Bug 842249 - FTU is not checking properly if Facebook is enabled or not
Bug 840208 - Dont attach gps information when photo is taken via activity
Bug 840322 followup - fixing panel with input type=range
r=vingtetun
Merge pull request #8167 from etiennesegonzac/settings-fix-panel-with-range

Bug 840322 followup - fixing panel with input type=range
Merge pull request #8168 from mozilla-b2g/daleharvey-camera-gps-leak

Bug 840208 - Dont attach gps information when photo is taken via activit...
Bug 841321 - Moving wifi fixing as global option since Wi-Fi is not SIM specific
Enabled edit list for email search screen also
Bug 842315 - [SMS][Desktop] Restore desktop testing r=fcampo
Bug 842349 - excluded v1* branches for travis
Merge pull request #8180 from yurenju/travis-exclude

Bug 842349 - excluded v1* branches for travis
Merge pull request #8170 from leob2g/Bug_838490_MultilistEdit_in_EmailSearch

Bug 838490 - Enabled edit list for email search screen also. r=asuth
Merge pull request #8169 from lodr/bug-841321-wifi-reset

Bug 841321 - Moving wifi fixing as global option since Wi-Fi is not SIM specific
Cause r+