Bug 924928 - Update general Yahoo! search engine icon. r=mfinkle
Bug 917273 - Fix PinSiteDialog to handle pinning user-entered terms. r=wesj
Bug 924614 - Fix duplicate Scratchpad menu items in Web Developer menu. r=mratcliffe
Bug 924133 - Remove Android WebApps preprocessing. r=wesj

The existing code complicates the build system and IDE integration.
This keeps most of the flexibility while simplifying the build system.
Bug 923306 - Add JAVA_JAR_TARGETS. r=glandium
Bug 923306 - Make annotationProcessors build with -Xlint:all. r=ckitching
Bug 923306 - Build annotationProcessors with JAVA_JAR_TARGETS. r=glandium
Bug 923306 - Follow-up: Address review comment. r=me
Bug 717490 - Remove support for importing logins from legacy signons.txt format, as well as base64 conversion. r=mattn
Bug 910172 - Refactor XPIProvider.importPermissions out to a reusable JSM. r=Mossop
Merge m-c to fxteam
merge fx-team to mozilla-central