Bug 980480 - hit testing and boundaries fail on retina displays, r=tbsaunde
Bug 978023 part.1 nsTextStateManager should be mozilla::IMEContentObserver and separated from nsIMEStateManager.cpp r=smaug

--HG--
rename : dom/events/nsIMEStateManager.cpp => dom/events/IMEContentObserver.cpp
rename : dom/events/nsIMEStateManager.cpp => dom/events/IMEContentObserver.h
Bug 978023 part.2 Clean up IMEContentObserver r=smaug
Bug 978023 part.3 Rename nsIMEStateManager to mozilla::IMEStateManager r=smaug

--HG--
rename : dom/events/nsIMEStateManager.cpp => dom/events/IMEStateManager.cpp
rename : dom/events/nsIMEStateManager.h => dom/events/IMEStateManager.h
Bug 978023 part.4 Clean up IMEStateManager r=smaug
Bug 950371 - Convert the Cocoa widget consumers of imgIContainer::GetFrame to act on a Moz2D SourceSurface instead of a Thebes gfxASurface. r=mattwoodrow,mstange. Relanding after accidental backout during m-c merge in ce1a691650ef.
Bug 981020 - Initialize the map before using it in nsWindowGfx::CreateIcon. r=mattwoodrow
Merge m-c to inbound
Bug 963073 - Followup: Mark tests as no longer failing on B2G due to tiling being enabled (see bug 916112). r=orange
Bug 980211 - Suppress clang warnings in third-party media code: speex, theora, and vpx. r=derf
Bug 980783: Make reftest scale-1.svg use MozReftestInvalidate for dynamic tweak, and make its reftest.list annotations more strict. r=jwatt
Backed out changeset a2b62ced704d (bug 950371)
Backed out changeset c6cec6e8dbac (bug 980436) for crashes; CLOSED TREE
Bug 979665 - Properly detect WebIDL type changes; r=froydnj

This patch fixes a bug in WebIDL code generation that could be triggered
if an input file changed locations but the original file remained on
disk. When computing the set of source .webidl files to perform code
generation on, we failed to prune files that were no longer part of the
active set of input files. References to files in old locations would
get pulled in to the regeneration set, leading to a cryptic KeyError
during code generation.

--HG--
extra : rebase_source : 23f1b973133960cfa954d44b20175fc7a369169a
Bug 980136 - Fix creating test file failure issue. r=dhylands
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/e5afb2db4f9a
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #16953 from viorelaioia/bug_980274

Bug 980274 - Unxfail test_cost_control_ftu.py as Bug 979341 is fixed

========

https://hg.mozilla.org/integration/gaia-central/rev/154eba1dba7b
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 980274 - Unxfail test_cost_control_ftu.py as Bug 979341 is fixed
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/fd46a1d43d56
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #16950 from zacc/bug_973598

Bug 973598 - Add get_all_sms, add debug into test_sms_notification.

========

https://hg.mozilla.org/integration/gaia-central/rev/aaf2defc7253
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 973598 - Add get_all_sms, add debug into test_sms_notification.
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/873b197d2cdf
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #16904 from zacc/bug_979253

Bug 979253 - Remove deprecated LockScren class from gaiatest

========

https://hg.mozilla.org/integration/gaia-central/rev/e787a98c4f6e
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 979253 - Remove deprecated LockScren class from gaiatest