Bug 939040 - Add eyedropper tool and include it in the color picker tooltip; r=pbrosset
backout f1a7f2af1dce (Bug 981852) because its no longer needed. r=backout
Bug 831593 - Updater/uninstaller helper.exe deletes Firefox AppCompatFlags registry entry during upgrade. r=bbondy
Merge m-c to fx-team.
Bug 983350 - Follow-up: Rev User-Agent string. r=rnewman
Bug 990680 - Remove extras from GlobalSession constructor. r=rnewman
Merge m-c to inbound to fix the CLOSED TREE
Bug 988437 - Part 1: Allow unpickling across Android Account types; bump pickle version. r=rnewman
Bug 988437 - Part 2: Make Firefox Account Android Account type unique per package. r=rnewman

This bumps every package's account type so that any issues shake out on
Nightly (which otherwise would not have experienced an account type
change).

The trivial change to the AndroidManifest is to ensure that the new
Account type is picked up by the build system, in the hopes of avoiding
a clobber.
Bug 990872 - Eliminate Places dependency in Sync utils. r=gps
Bug 990116 - Pre: Remove UITest.mActivity. r=mcomella
Bug 990116 - Part 0: Move UITest.Type to BaseRobocopTest. r=mcomella
Bug 990116 - Part 1: Split BROWSER_INTENT_CLASS and BROWSER_INTENT_CLASS_NAME. r=mcomella
Bug 990116 - Part 2: Use BROWSER_INTENT_CLASS in Robocop tests. r=mcomella
Bug 990116 - Part 3: Use BROWSER_INTENT_CLASS in browser JUnit 3 tests. r=mcomella
Bug 990116 - Part 4: Make UITest inherit from BaseRobocopTest. r=mcomella
Bug 990116 - Post: Clean Robocop imports. r=trivial
Backed out changeset 535756591289 (bug 939040) for ticking an assertion after the latest m-c merge; CLOSED TREE
merge fx-team to mozilla-central