Bug 950505 - Build content/media/wmf in unified mode; r=roc
Bug 950506 - Build content/media/directshow in unified mode; r=roc
Bug 950507 - Build content/media/fmp4 in unified mode; r=roc
Bug 950508 - Build widget/windows in unified mode; r=roc
Bug 950504. Remove MatrixForThebesMatrix. r=mattwoodrow

--HG--
extra : rebase_source : 77103221abbb55d23f9d399d4973ef0b8f269079
Bug 949880 - Refactor Android Sync's SyncAdapter for FxAccount use. r=rnewman

--HG--
extra : rebase_source : 28937855c499bb621458b15424ac67378e43f9db
Bug 938107 - Wait for media state machine thread to shutdown during XPCOM shutdown before returning. r=roc

Add a MediaShutdownManager and have that as the only xpcom-shutdown
observer. This then shutsdown the MediaDecoders, and blocks waiting for
the media state machine's shared thread to complete shutdown before
exiting from the xpcom-shutdown observer. This ensures that the
MediaDecoder infrastructure does not use XPCOM on any thread after XPCOM
has shutdown, which is a logical error.
Bug 938107 - Backed out changeset 7aff3ce81046 for bustage. r=bustage.
Merge m-c to f-t
Bug 938108 - Wait for media state machine thread to shutdown during XPCOM shutdown before returning. r=roc

Add a MediaShutdownManager and have that as the only xpcom-shutdown
observer. This then shutsdown the MediaDecoders, and blocks waiting for
the media state machine's shared thread to complete shutdown before
exiting from the xpcom-shutdown observer. This ensures that the
MediaDecoder infrastructure does not use XPCOM on any thread after XPCOM
has shutdown, which is a logical error.
Back out 377f51d0e354 (bug 938108) for crashtest shutdown crashes
Bug 948258 - Move browser tests from dom/indexedDB/test/Makefile.in to browser.ini. r=ted
Bug 948326 - Actually address review comments in bug 918135 r=cpearce
merge fx-team to mozilla-central
merge b2g-inbound to mozilla-central
Merge m-c to b2g-inbound.