Bug 663778 - Changes to layout view for box model highlighter r=pbrosset
Bug 663778 - Misc fixes r=pbrosset
Bug 663778 - Box Model Highlighter r=jwalker
Bug 663778 - Tests: Charsets to utf-8 r=jwalker
Bug 663778 - Changes to tests for box model highlighter r=jwalker
Bug 663778 - Use flag instead of pref for mozafterpaint switch and highlighter noautohide r=jwalker
Bug 875562 - Part 9: Change Health Report to pull from crashes manager; r=bsmedberg, r=rnewman

This patch changes Firefox Health Report to pull crash counts from the
newly-implemented crash manager. The crash manager is now the canonical
source of crash data, so all the code for reading crash dump files from
disk has been removed.

This regresses the collection capability of Firefox Health Report by
removing plugin crashes and hangs from the reported values. This
regression is intended to be temporary and a follow-up bug will be
created to add plugin process event recording to the crash events
system.

This regression has been justified because the old crash reporting
mechanism was severely flawed and wasn't sending accurate data (not all
crashes were being saved to dumps and some dumps would be deleted).

--HG--
extra : amend_source : d54bb3bf9f740508cb4eda286536ce16a4c3bee5
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/1b1fd31dac08
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #16765 from flodolo/dialer_ampm_l12y

Bug 977145 - [dialer] Make AM/PM localizable when displaying clock

========

https://hg.mozilla.org/integration/gaia-central/rev/f04ebf9fe7df
Author: Francesco Lodolo (:flod) <flod@lodolo.net>
Desc: Bug 977145 - [dialer] Make AM/PM localizable when displaying clock
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/64c4ab231001
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Merge pull request #17170 from jonallengriffin/disable_test

Bug 982260 - Disable Contacts details_test.js, r=gwagner

========

https://hg.mozilla.org/integration/gaia-central/rev/e03af642cf35
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Bug 982260 - Disable Contacts details_test.js, r=gwagner
Bumping manifests a=b2g-bump
Bug 978876 - Part 0: add set utilities to CommonUtils. r=gps
Bug 978876 - Part 1: handle declined engines in desktop Sync meta/global. r=gps
* * *
Bug 978876 - Part 2: refactor out meta/global upload.
Bug 978876 - Part 2: refactor out datatype choice. r=markh
Bug 978876 - Part 3: mark engines as declined after making a datatype election. r=markh
Bug 983414 - fix sync success copy and formatting. r=markh
Bug 978944 - Use Android native code pbkdf2sha256 in FxAccounts. r=rnewman,mcomella

--HG--
extra : rebase_source : 73cc0d3b480246f64a07388caafda56465039bda
Bug 967022 - Fix Gingerbread progressbar animation bustage. r=rnewman

--HG--
extra : rebase_source : 1db653efb3d0656b9208ade6859f86fb10f1be3b
Bug 983350 - Include User-Agent header for FxAccount and TokenServer requests. r=rnewman

--HG--
extra : rebase_source : cb622c61646be2752e4900fd6e480874e9ba5406
Bug 915835 fix leak in socialmarks event listeners, r=markh