Bug 1074670 - Implement the Hello NotificationView's button (e.g. retry). r=pkerr

--HG--
extra : rebase_source : 9c712ce0b135826acb0ff48b3f7ef08e7b64c0b2
Bug 1062127 - Style the in-content preference dialogs. r=dao

--HG--
rename : browser/themes/shared/incontentprefs/preferences.css => browser/themes/shared/incontentprefs/preferences.inc.css
Bug 1022579 - Preferences: Switch help and dropdown glyphs to SVG. r=jaws
Bug 1096921 - Fix typo in CategoryManagerInterposition.methods.deleteCategoryEntry. r=mconley
Bug 1065191 - Add test coverage for the style property of places autocomplete results. r=paolo
Bug 1096248 - Disable restyling of autocomplete search page items. r=paolo
Bug 1096787 - copy new logins.json database when using fx reset, r=MattN

--HG--
extra : rebase_source : e0d9ecd2d99c7e479869ee0066ab0521d21133f3
Bug 1082133 - browser_*_behavior.js fails when run as a standalone directory. r=mak
Bug 1095216 - Fix breakpoints when multiple of the 'same' source are loaded concurrently. r=ejpbruel
Bug 1095723 - browser_addons.js fails quite frequently in e10s and --run-by-dir. r=mixedpuppy
Bug 1093209 - "Handle "go back" session history menu Fringe cases". r=bnicholson
Backed out changeset ed42b5ee3c94 (bug 1096248) for bc-1 test failures
Bug 960746 - Sync tab state with gecko state in onLocationChange to update navigation buttons. r=lucasr
Merge mozilla-central to fx-team
Bug 1074702 - Part 2: Room views for Loop standalone. r=Standard8
Bug 1074693 - Loop desktop room preview to use fullscreen local videostream. r=Standard8
Bug 1097364 - Support <OpenSearchDescription> as the root tag of a search plugin. r=bnicholson
Bug 1094830 - Fix an off by one pixel error causing the new tab button to shake once it reaches the end of the window;r=MattN
Bug 1097408 - Use opaque background color values to fix  new tab button hover on linux;r=Gijs
Bug 1095298 - Ignore 'C' locale when initializing nsLocaleService on Android. r=emk

On Android Lollipop, our setlocale call returns "C", rather than the null it returns on earlier Android versions.

This impacts locale detection, causing devices to always appear to be in en-US.

This patch conditionally ignores "C" if MOZ_WIDGET_ANDROID is set.