(no bug) Fix comment typo: s/frames/frame's/ DONTBUILD
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/cd8bca91713b
Author: Salvador de la Puente González <salva@unoyunodiez.com>
Desc: Merge pull request #11968 from lodr/bug-896917

Bug 896917 - Visual polish and behavior completed
r=jmcf

========

https://hg.mozilla.org/integration/gaia-central/rev/038c506f33ff
Author: lodr <salva@unoyunodiez.com>
Desc: Bug 896917 - Visual polish and behavior completed
Don't include mozilla-config.h in gfx.layers. No bug. r=me
Bug 906445. Some speculative fixes to guard against dereferencing nullptrs. r=Bas
Bug 913298. Remove AddMaskEffect and RemoveMaskEffect declarations. r=nical
Bug 909607. Check if we are minimised before compositing. r=Bas
Bug 912352. Do an async composite as soon as we get a WM_PAINT message. r=roc
Bug 910996 - Move MP3FrameParser out of B2G specific code, so it can be used on other platforms. r=padenot

--HG--
rename : content/media/omx/MP3FrameParser.cpp => content/media/MP3FrameParser.cpp
rename : content/media/omx/MP3FrameParser.h => content/media/MP3FrameParser.h
Bug 910966 - Use MP3FrameParser in DirectShow's SourceFilter, to more accurately determine the offset of the first MP3 frame. This enables us to only pass the MP3 data into DirectShow, which can't handle large ID3v2 tags. r=padenot
Bug 910966 - Bustage fix for 48a66737dc5c. Forgot to qref. r=bustage.
Bug 897960 - walker should support mozbrowser iframes. Patch E. r=dcamp
Bug 906713 - reset default capture timeout earlier to prevent oranges.  r=adw
Bug 875986, part 1 - use custom docShell flags instead of private-browsing for b/g thumbnails.  r=adw
Bug 875986, part 2 - additional test that no cookies are stored by pages captured in the background.  r=adw
Backout 86b5d8778fc4,fab07b9d6dee,89a059433037,bbb54cde82c3 (bug 897960) due to orange
Merge backout, a=bustage fix
Bug 912173 - Always AddRef and Release the GLContext when sharing a SurfaceStream to avoid mismatches. r=nrc
Bug 910937: Remove xpc_UnmarkGrayObject and use JSAPI directly. r=mccr8
Bug 910924: Give workers an nsIGlobalObject. r=bent,bholley
Bug 911258: Part 1 - Remove nsIExceptionService/Manager usage. r=bholley