Bug 865155 - Email divider lines are incorrect. They should have a 15 pixel gap at both ends to match system. | Follow up patch
Bug 796369 - Software button manager
Bug 881127 - Used GAIA_DEV_PIXELS_PRE_PX instead of HIDPI r=timdream
Bug 876265 - One FM test fails on TBPL
Bug 882577 - Remove error message after successfully request
Bug 884764 - Store chart visibility by SIM
Bug 884486 Stored MCC matches nsIDOMMozMobileNetworkInfo r=daleharvey

Bug 828307 changed the type of the MCC in nsIDOMMozMobileNetworkInfo to
string.  Stored MCC values must also be of type string.

Change-Id: Idf861d2a372ffa4e428d9af3aa6439337a516e40
Bug 869383 - Remove extra colon
Merge pull request #10497 from KevinGrandon/bug_869383_remove_homescreen_port

Bug 869383 - Remove extra colon
Merge pull request #10479 from yurenju/hidpi

Bug 881127 - Used GAIA_DEV_PIXELS_PRE_PX instead of HIDPI r=timdream
Merge pull request #10483 from mozshiao9/master_fm_876265

Bug 876265 - One FM test fails on TBPL, r=pinzhang
Merge pull request #10398 from pivanov/bug-865155

Bug 865155 - Email divider lines are incorrect. They should have a 15 pixel gap at both ends to match system. | Follow up patch r=@samjoch
Merge branch 'master' of https://github.com/mozilla-b2g/gaia into bugzilla/796369_master/software-button-manager

Conflicts:
	apps/settings/index.html
Merge pull request #10455 from alivedise/bugzilla/796369_master/software-button-manager

Bug 796369 - Software button manager, r=timdream
Merge pull request #10473 from mschwart/bug884486

Bug 884486 Stored MCC matches nsIDOMMozMobileNetworkInfo r=daleharvey
Merge pull request #10485 from lodr/bug-882577-remove-connection-warning

Bug 882577 - Remove error message after successfully request
r=arcturus
Merge pull request #10488 from lodr/bug-884764-store-chart-visibility-by-sim

Bug 884764 - Store chart visibility by SIM
r=arcturus