Bug 1009648 - nsStandardURL crashes when calling SetHost after Clear(). r=mcmanus
Bug 1027898 - Implement most of nsIContentPrefService2 for e10s. r=adw
Bug 1040130 - Allow specifying a client cert for sockets. r=keeler, r=mcmanus
Bug 1046732 - Part 1: Fix incorrect event message used in TouchCaret.cpp. r=ehsan

NS_WHEEL_EVENT_START isn't a specific event message for compairing in
the switch case. Since we would like to hide touch caret whenever
receving wheel events, all the wheel event types are added.
Bug 1046732 - Part 2: Test touch caret will be hidden by wheel event. r=ehsan

This test logic is similar to
_test_touch_caret_timeout_by_dragging_it_to_top_left_corner_after_timout.
Bug 1049684 - Fix SDP verification to be able to run on steeplechase environment. r=bwc
Bug 1001657 - Skip testPromptGridInput on Android 2.3 for frequent intermittent failures.
CLOSED TREE
Bumping manifests a=b2g-bump
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/aa934b827342
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #22501 from pivanov/bug-1037606

Bug 1037606 - The placeholder text shown when the list of contacts is empty is left aligned in RTL mode

========

https://hg.mozilla.org/integration/gaia-central/rev/90b0ffacd479
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1037606 - The placeholder text shown when the list of contacts is empty is left aligned in RTL mode

========

https://hg.mozilla.org/integration/gaia-central/rev/893149213746
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #22502 from pivanov/bug-1037607

Bug 1037607 - The drop-down fields in the add contact dialog are left aligned

========

https://hg.mozilla.org/integration/gaia-central/rev/46944f3c88fb
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1037607 - The drop-down fields in the add contact dialog are left aligned

========

https://hg.mozilla.org/integration/gaia-central/rev/17f156ed4f0a
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #22586 from vingtetun/system.dialog.size2

Bug 1047411 - Firefox Accounts UI misplaced. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/8938b405f3ba
Author: Vivien Nicolas <vnicolas@mozilla.com>
Desc: Bug 1047411 - Firefox Accounts UI misplaced. r=alive
Bumping manifests a=b2g-bump
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/cffb8e7efe8a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #22504 from KevinGrandon/bug_1048629_remove_haida_flag

Bug 1048629 - Remove rocketbar.enabled setting

========

https://hg.mozilla.org/integration/gaia-central/rev/aed32eb077b6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1048629 - Remove HAIDA setting from build scripts R=alive R=yurenju F=sfoster

========

https://hg.mozilla.org/integration/gaia-central/rev/6aec0bd4b583
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #22590 from vingtetun/low.battery.red

Bug 1049759 - Low battery indicator on the browser chrome titlebar is no...

========

https://hg.mozilla.org/integration/gaia-central/rev/62df7c175df3
Author: Vivien Nicolas <vnicolas@mozilla.com>
Desc: Bug 1049759 - Low battery indicator on the browser chrome titlebar is not red. r=kgrandon
Bug 1037617 - Skip testSearchSuggestions on Android 4.0 for being perma-fail.
CLOSED TREE
Bumping manifests a=b2g-bump
Merge fx-team to m-c. a=merge
CLOSED TREE
Merge m-c to b2g-inbound. a=merge
CLOSED TREE
Bug 1046419 - Refine widget appearance. r=margaret
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/6b8f72fc133b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #22587 from KevinGrandon/bug_1049678_wc_text_content

Bug 1049678 - [GaiaGrid] Remove textContent workaround

========

https://hg.mozilla.org/integration/gaia-central/rev/ef49448d1ede
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1049678 - [GaiaGrid] Remove textContent workaround r=wilsonpage
Bumping manifests a=b2g-bump
(no bug) Adjust a comment in test_flexbox_flex_shorthand.html. comment-only, DONTBUILD

In particular, I'm:
 - Adding a missing close-quote charater to the flex-grow/flex-shrink line
 - Bringing the spec quote in the flex-basis line up-to-date w/ current spec ED.
Bug 1049893 - Allow mach mercurial-setup to work if no ~/.hgrc exists; r=gps

DONTBUILD (NPOTB)

--HG--
extra : rebase_source : 8788d55cd5cfa5e64627d7951209c5f2c1222f0a