Bug 959154 - Part 1: Moz2Dify gl::UploadImageData. r=nical
Bug 959154 - Part 2: Remove local ImageFormatForSurfaceFormat. r=nical
Bug 959154 - Part 3: Deprecate naming of gl::UploadTextureForSurface for thebes. r=nical
Bumping manifests a=b2g-bump
Bug 959154 - Part 4: Deprecate thebes version of GLTextureImage::DirectUpdate. r=nical
Bug 959154 - Part 5: Create Moz2D version of TextureImage::DirectUpdate. r=nical
Bug 959154 - Part 6: Move away from DeprecatedDirectUpdate and remove them. r=nical
Bug 959154 - Part 7: Moz2Dify GLTextureImage::BeginUpdate/EndUpdate. r=nical
Bug 959154 - Part 8: Moz2Dify GLUploadHelpers. r=nical
Bug 941701 - Fix crash in TextTrackCue::GetCueAsHTML r=rillian

TextTrackCue::GetCueAsHTML gets called when the HTMLMediaElement
shutsdown which means that TextTrackCue's mDocument sometimes no longer
exists based on when the cycle collector freed it. I've added a null
check to make sure that it exists before we start doing anything.
Bug 968606 - Update in-content/advanced.js to use HTTP cache v2 API, r=bbondy
Bug 970939 - Remove unwanted non-SPDY assertion from nsHttpConnection::StartShortLivedTCPKeepalives() r=mcmanus
Bug 936236 - Wait on background sweeping to complete after large-allocation-failure callback (r=jonco)

--HG--
extra : rebase_source : a93e691cbd76995abfa4ceed709c495fdb97d62c
Bug 952321 - Don't add proxy stubs in unbarriered GetPropertyICs. (r=jandem)
Bug 966911 Part 4: Recreate the underlying nsAString when an an external string is passed back to C++ r=bholley
Bug 969375 - MIPS port: Added Architecture-mips files. r=nbp
Bug 969375 - MIPS port: Added Assembler-mips files. r=froydnj,nbp
Merge m-c to inbound.
Backed out changeset c0f1774ac976 (Bug 969375) for wrong author.

This reverts commit 30bf38956a3125c9bea1a9e94ad36ccee6416429.
Bug 969375 - MIPS port: Added Assembler-mips files. r=froydnj,nbp