Bug 798914 (part 6) - Followup: move MemoryReporting.h include after the cpp's own header include.  r=njn.
Bug 877248 - Use a TextureView and setAlpha to make preview invisible. r=blassey
Bug 874569 - Adjust rotation amount if the Android device is rotated. r=blassey
Bug 713933: Make false start work with asynchronous certificate verification, r=bsmith

--HG--
extra : rebase_source : b895a399e381996f7e55d06f94a684469e287b8d
bug 658222 - Enable TLS False Start (PSM) r=bsmith

--HG--
extra : rebase_source : ac9f77ba73a0a902f4b6aa8d52add7d52efb1b53
Bug 888132 - MOZ_GOOGLE_API_KEY_FILE should be an include file. r=khuey
Bug 498181 - Offer to reset a user's profile if it was last used more than two months ago. r=jaws

--HG--
rename : toolkit/content/resetProfile.js => toolkit/modules/ResetProfile.jsm
extra : rebase_source : 88969c77e4d86ba2d6cecbe188e19ad390f6629d
Bug 888570 - Lazily load ForgetAboutSite.jsm from browser/components/places/content/controller.js. r=jaws

--HG--
rename : toolkit/content/resetProfile.js => toolkit/modules/ResetProfile.jsm
extra : rebase_source : 840e79ad4b087999f08ffbdbf152418ecb9182ea
Bug 883024 - Install missing stylesheets for b2g. r=roc
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/99e9d27a6122
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #10691 from huchengtw-moz/video/Bug_876688_progress_slider_shows_0001

Bug 876688 - [video] Progress slider shows 00:01 when it first appears, r=@djf

========

https://hg.mozilla.org/integration/gaia-central/rev/212aaa4fbe12
Author: John Hu <johu@mozilla.com>
Desc: Bug 876688 - [video] Progress slider shows 00:01 when it first appears
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/88b1d8837580
Author: Francisco Borja Salguero Castellano <fbsc@tid.es>
Desc: Merge pull request #10536 from evanxd/bug-880257

Bug 880257 - [MMS] Implement a "Device without SIM" message when attempting to send messages without a SIM card

========

https://hg.mozilla.org/integration/gaia-central/rev/0e6dd47508e7
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 880257 - Show error messages when send SMS and MMS messages without SIM card, in air plane mode, or with other error.
Bug 887468 - Make custom request form look okay; r=vporof
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/688fc3ba0ba2
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #10692 from crdlc/bug-887801

Bug 887801 - [Search UI] the progress and "no contacts found" message are not displayed

========

https://hg.mozilla.org/integration/gaia-central/rev/0f63f36b6f7e
Author: crdlc <crdlc@tid.es>
Desc: Bug 887801 - contacts app search \"no contacts found\" message is not displayed
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/cba83cc33359
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #10714 from timdream/remove-responsive

Bug 870318 - Remove the poor man's multi-resolution support, r=basiclines

========

https://hg.mozilla.org/integration/gaia-central/rev/db5d8f1c43e9
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 870318 - Remove the poor man's multi-resolution support
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/b781d1e14fd8
Author: Mihai Cîrlănaru <mihai@cirlanaru.com>
Desc: Merge pull request #10707 from mcirlanaru/bug_848196

Bug 848196 - [Keyboard] Keep special characters in upper case if caps is... r=@RudyLu

========

https://hg.mozilla.org/integration/gaia-central/rev/2c4f18f4e91e
Author: Mihai Cirlanaru <mihai@cirlanaru.com>
Desc: Bug 848196 - [Keyboard] Keep special characters in upper case if caps is locked. r=rudyl
Bug 883770 - [Dialer][SMS][Contacts] Call log does no longer show contact names after version upgrade. r=gwagner
merge m-c to fx-team
Merge inbound and m-c.
Merge m-c and birch.
Bug 887012 - Revert removed Makefile, since it wasn't emptyish after all.