Bug 887394 - Don't collect state right after startup when restoring the initial session; r=yoric
Bug 883220 - Raise the toolbox window if breakpoint is hit, r=vporof
Bug 656273 - Create a toolbar for Scratchpad; r=dcamp
Bug 828038 - Change profile recording UI and behavior; r=dcamp
Bug 888120 - Add an image file for the profiler stopwatch button; r=me
Merge mozilla-central and fx-team
Bug 886137 - Can't inspect objects in the webconsole, while debugging and inspecting; r=past
Bug 886036 - Port pseudoclass lock to the inspector actor. r=harth

--HG--
extra : rebase_source : c515e1a85da5d484686e1ae8b55c4dbfd90f214f
Bug 883178 - [MMI] Implement DOMMMIResult and DOMMMIError. Part 1: DOMError. r=sicking, sr=peterv
Bug 883178 - [MMI] Implement DOMMMIResult and DOMMMIError. Part 2: DOMMMIResult and DOMMMIError. r=vicamo, sr=sicking
Bumping gaia.json for 6 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/c201d63425a6
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #10708 from ferjm/mmiresultfinal

MMI localization support (multiple commits)

========

https://hg.mozilla.org/integration/gaia-central/rev/110a490561bb
Author: Fernando Jiménez <ferjmoreno@gmail.com>
Desc: Bug 879685 - (mmi-localization-cw) [MMI] Localization of Call Waiting functionality. r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/a24294e33110
Author: Fernando Jiménez <ferjmoreno@gmail.com>
Desc: Bug 879694 - (mmi-localization-cb) [MMI] Localization of Call Barring functionality. r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/f21ed81960ce
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Bug 879680 - (mmi-result-cf) [MMI] Use MMIResult for Call Forwarding related functionality. r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/acea7c21c021
Author: Fernando Jiménez <ferjmoreno@gmail.com>
Desc: Bug 874000 - (mmi-result-pin) [MMI] Use MMIResult for PIN/PIN2/PUK related functionality. r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/bb0646386fb4
Author: Fernando Jiménez <ferjmoreno@gmail.com>
Desc: Bug 884349 - [MMI] Use MMIResult for get IMEI. r=rik
Merge fx-team to m-c
Merge m-i to m-c
Merge m-c to m-i