Bug 872890:Reset HFP call array when RIL reports NotifyError(), r=echou
Backed out changeset 8cdcc0221c0f for build bustage DONTBUILD
Backed out changeset 8cdcc0221c0f for build bustage DONTBUILD
Bug 877087 - Clear mDsFile after the OPP connection is dropped, r=gyeh
Bug 876935 - Millisecond calculation in AlarmService. r=gene
Merge m-c to birch.
Bug 865207 - Move webapps actor from /b2g/chrome/content to /toolkit/devtools/apps/. r=fabrice, r=dcamp

--HG--
rename : dom/apps/tests/unit/data/app.zip => toolkit/devtools/apps/tests/unit/data/app.zip
rename : dom/apps/tests/unit/test_webappsActor.js => toolkit/devtools/apps/tests/unit/test_webappsActor.js
rename : b2g/chrome/content/dbg-webapps-actors.js => toolkit/devtools/server/actors/webapps.js
Bug 870675 - Add a test for bug 870480. r=vingtetun

We now run test_HighPriority while holding the CPU and high-priority wake locks.  This tests exactly the problem caused by bug 870480.
Bug 852720 - Allow packaged apps to have an origin r=ferjm
Bug 876099 - re-enable 3gp support in web content r=roc, a=gal
Bug 874459 - Set a valid window icon for desktop on Mac; r=myk

--HG--
extra : amend_source : 19a58dfe68f8ff349ebf8858dc8e0fb27ef51b02
Bug 877869 - Fix typo in indexedbHelper.jsm r=bent
Bug 874065 - On B2G, dmp memory reports to /data/local/tmp/memory-reports, and make that directory have 0777 permissions. r=dhylands
Merge m-c to birch.

--HG--
rename : gfx/layers/TestTiledLayerBuffer.cpp => gfx/tests/gtest/TestTiledLayerBuffer.cpp
Bug 872890:Reset HFP call array when RIL reports NotifyError(), r=echou
Merge birch to m-c.