Merge mozilla-central to inbound. a=merge CLOSED TREE
commitf23925fc773e4df8668e4a33304a5ff25ded4188
authorMargareta Eliza Balazs <ebalazs@mozilla.com>
Mon, 9 Apr 2018 09:04:08 +0000 (9 12:04 +0300)
committerMargareta Eliza Balazs <ebalazs@mozilla.com>
Mon, 9 Apr 2018 09:04:08 +0000 (9 12:04 +0300)
tree69d8c09a0b3655e4c6ff181d59be457c76daed1b
parent782365b41547cf7d3ccc2ef7fb5b1acd05add35a
parent24ef51813569d8f4998ce3d7d914142521e194d9
Merge mozilla-central to inbound.  a=merge CLOSED TREE