Bug 1097926 - Avoid calling isLoggable r=nalexander
Bug 1098456 - Increase timeout in blockForEvent (hail mary) r=gbrown
Bug 1098082 - Follow-up: fix bustage from ckitching not running tests. r=me, DONTBUILD because doesn't affect m-c tests.
Bug 1091728 - (Part 0) Move getFileContents into FileUtils. r=rnewman
Bug 1091728 - Use correct gecko default search engine in search activity. r=rnewman
Bug 1097743 - Part 1: Loop standalone styling enhancements. r=Standard8
Bug 1097742 - Part 1 Handle access being denied to media, and prevent the sdk prompts from showing in Loop Rooms. r=nperriault
Bug 1084498 - Update Android SDK to v21 (Lollipop). r=coop
No bug - Unify android-sync git repo with m-c. r=trivial
Bug 966103 - Add a 'Sync now' button to the main FxA status screen. r=nalexander,rnewman
Bug 1098444 - Add local.properties with sdk.dir for Gradle. r=trivial

It's possible this could go in gradle.properties, but this is what's
widely documented.
Bug 1098239 - Use latest gradle and android plugin (r=nalexander)
Bug 1084498 - Touch CLOBBER after updating Android build tools. r=me
Bug 956482 followup - Add license header and fix line endings. r=me
Bug 1097742 followup - add comma to fix syntax error. r=me
Bug 1087112 - Fix intermittent issues with browser_586068-reload.js r=smacleod
Bug 1098135 - Traverse directories with misc rules; r=glandium

When the misc tier was added, only directories with misc-associated
variables from moz.build were traversed. This patch adds a dummy
variable to moz.build whose presence will add the directory to the misc
tier.

This will enable us to aggressively convert existing libs:: rules
to the misc tier.

--HG--
extra : rebase_source : c5477010c7d87fafa512f4fbbf1d2b995e07ffbd
extra : amend_source : a54eee6254ef2d63ef6b247d45e38eda2ab88fef
extra : histedit_source : c0f3352e84ec18ca7b88571cd5f9c2a33ab8eda9
Bug 1098135 - Convert some rules to misc tier; r=glandium

--HG--
extra : rebase_source : 1a486bf0ff2e5b3be637f3725cd04b6073e074b8
merge fx-team to mozilla-central a=merge