Bug 953045 - Fix a bug of bluetooth AVRCP to support media metadata updating correctly. f=shuang, r=echou
Bug 961498: Prevent ICO decoder from exploding when faced with single-resource ICOs r=rnewman
Merge m-c to fx-team.
Bug 961532 - get rid of win7-specific-but-really-identical inverted Toolbar.png for Australis, r?ttaubert
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c94fb9636998
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #15002 from dominickuo/bug-949016

Bug 949016 - [music] include the missing css file in open.html, r=jimporter

========

https://hg.mozilla.org/integration/gaia-central/rev/928c52ba3121
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Bug 949016 - [music] include the missing css file in open.html
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/997156ae4add
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #15340 from huchengtw-moz/video/Bug_947103-visual-update-player

Bug 947103 - [Video] Update to refreshed video player, r=ivanovpavel

========

https://hg.mozilla.org/integration/gaia-central/rev/27babd36ee0c
Author: John Hu <johu@mozilla.com>
Desc: Bug 947103 - [Video] Update to refreshed video player
Bumping manifests a=b2g-bump
merge b2-inbound to mozilla-central
merge fx-team to mozilla-central with australis change included

--HG--
extra : amend_source : 775ddd556112681669257547e825f4c9c6f3c62d
Merge mozilla-central to mozilla-inbound including australis

--HG--
extra : amend_source : ea6e6ce90b225ac5058e9ba3a907628feb96c8a0