Bug 960879 - [music2] Fix the tabs
Bug 961522 - [ftu] typos in ftu: "pckodeLabel" should be "spckcodeLabel", "messasges" should be "messages"
Bug 835307 - Polish l10n properties of Cost Control
Bug 963108 - Remove reference to icc_helper library
Bug 965792 -[Costcontrol] Error on FTE when cardState change
Bug 967540 - [Contacts] Exporting to SD card contacts imported from Gmail with invalid dates never ends
Bug 967708 - [B2G][l10n][Settings] German: "Change PIN" doesn't use localization
Bug 903253 - [Gaia][Video] Video application: handle data transfer
Fixed sort() comparison in CameraUtils.selectOptimalPreviewSize().

Fixed rounding error in CameraUtils.selectOptimalPreviewSize() and added real-world test data.

Fixed sort() comparison in CameraUtils.selectOptimalPreviewSize().
Bug 966893 - [Search] Adjust font size
Revert "Revert "Merge pull request #15857 from comoyo/bug964216""

This reverts commit 33eb812eadb61f76744103105e099972a8255843.
Merge pull request #15966 from timdream/keyboard-build-2

Revert "Revert "Merge pull request #15857 from comoyo/bug964216""
Merge pull request #15837 from gitmai/bug-965792-CC-error-FTE

Bug 965792 -[Costcontrol] Error on FTE when cardState change
r=salva
Merge pull request #15649 from gitmai/bug-963108-remove-icchelper-reference

Bug 963108 - Remove reference to icc_helper library
r=salva
Merge pull request #15964 from KevinGrandon/bug_966893_adjust_font_size

Bug 966893 - [Search] Adjust font size
Merge pull request #15643 from gitmai/bug-835307-polish-l10n-properties

Bug 835307 - Polish l10n properties of Cost Control
r=salva
Merge pull request #15959 from EragonJ/bug-967708

Bug 967708 - [B2G][l10n][Settings] German: "Change PIN" doesn't use loca...
Bug 967237 - Shorten the Zh layout labels
Merge pull request #15627 from huchengtw-moz/video/Bug_903253_nfc_sharing

Bug 903253 - [Gaia][Video] Video application: handle data transfer, r=gduan
Merge pull request #15446 from jimporter/music2-fix-tabs

Bug 960879 - [music2] Fix the tabs, r=dominickuo