Bug 829003 - [CALL LOG] Fixed headers are not working fine in call log.
bug 829093 - we will get both onerror event and system message for
pairing cancelled, but we only need to handle it once.
Bug 818463 - remove duplicate 'reset-tracking' string
Bug 828295 - Remove power saving in quick settings
Bug 829362 - don't use mozRequestFullScreen() in the Gallery
Reduced the default STK timeout timers to 5secs in order to pass GCF tests. @see comments 17,18 & 19 of the 827655 bug
Merge pull request #7543 from fabi1cazenave/costcontrol-l10n-dup

Bug 818463 - remove duplicate 'reset-tracking' string, r=stas, a=21
Merge pull request #7512 from gtorodelvalle/dialer-bug-829003-no-fixed-headers-in-call-log

Bug 829003 - [CALL LOG] Fixed headers are not working fine in call log
Merge pull request #7536 from frsela/STK/Bug827655_c19

Bug 827655 - STK Get input display timeout takes too long, r=gal
Bug 829170 - Hiding trustedUI when opening app with activities
Bug - 827382 followup - fixing a regression on inbound
r=kaze
Merge pull request #7515 from evelynhung/issue-829093

bug 829093 - we will get both onerror event and system message for pairing cancelled, but we only need to handle it once. r=timdream, a=blocking-basecamp
Merge pull request #7545 from etiennesegonzac/settings-inbound-fix

Bug 827382 followup - fixing a regression on inbound
Merge pull request #7532 from alivedise/bugzilla/828295/remove-power-saving-in-quick-settings

Bug 828295 - Remove power saving in quick settings, r=timdream, b=vingtetun
Bug 829504 - [SMS] Restoring desktop mockups for testing.
Merge pull request #7546 from albertopq/issue-829170

Bug 829170 - Hiding trustedUI when opening app with activities r=alive
Merge pull request #7535 from davidflanagan/nofullscreen

Bug 829362 - don't use mozRequestFullScreen() in the Gallery
Merge pull request #7548 from borjasalguero/restore_desktop

Bug 829504 - [SMS] Restoring desktop mockups for testing.
Bug 829472 - [COST CONTROL] Telephony widget is showing 119 mins in calls although Telephony details only shows 1 min
Merge pull request #7550 from arcturus/bug-829472

Bug 829472 - [COST CONTROL] Telephony widget is showing 119 mins in call.s although Telephony details only shows 1 min

Merged because r+ and bb+