Bug 932331 - email extra logging for test timeout case
Merge pull request #13495 from jrburke/bug932331-log-state-waitForTransitionEnd

Bug 932331 - email extra logging for test timeout case r=gaye
Bug 925961 - Use the email address parser for showing bubble properly.
 Bug 916061 - [FDN] “OK” button should be disabled when adding a new contact, r=arthurcc
Merge pull request #12215 from fabi1cazenave/fdnOkButton-bug916061

 Bug 916061 - [FDN] “OK” button should be disabled when adding a new contact, r=arthurcc
Bug 930371 - Use "inputs" instead of "entry_points" in keyboard app manifest
Merge pull request #13338 from evanxd/bug-925961

Bug 925961 - [B2G][Email] Receiver's email address displays as "null" after saving, editing, and then saving the draft again
Merge pull request #13418 from timdream/keyboard-entry-point

Bug 930371 - Use "inputs" instead of "entry_points" in keyboard app manifest, r=rudyl
Revert "Bug 903232 - Show only gsm options by default"

This reverts commit ad7c92b4d02477d9096fed03963f9a2d8717a5a4.
Bug 903918 - [Flatfish][Settings] support 2 column layout for tablet
Bug 903918 - Add shared styles of building block in two_column.css