Bug 876796 - Hide show event / edit event details until model is loaded
Bug 865155 - Email divider lines are incorrect. They should have a 15 pixel gap at both ends to match system. | Follow up patch
Bug 883035 - [Email] Folder list card "last sync" label can overlap the settings icon; visible on pt-BR locale.
Bug 866376 - Change icon of enable storage
Bug 865995 - Reset all items to the original state after selecting an operator
Bug 796369 - Software button manager
Bug 882954: compute correct keyboard layout data for autocorrect
Bug 881218 - [Camera] Record of deleted videos are not updated in camera filmstrip
Bug 884225 - [B2G] [Leo][Contacts][Facebook] The last name of a linked Facebook contact is not removed after unlink the contact
Bug 880571 - [video] handle error codes for video element
gallery and camera already listening to poster deletion, removing listeners
Bug 882577 - Remove error message after successfully request
Bug 884764 - Store chart visibility by SIM
Bug 876736 - Added MMS reference workloads
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
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
Bug 883032 Browser media save error. Proposed patch