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
Merge inbound and m-c.