Bug 1057631 - Use real locale when pulling search engine out of the jar. r=rnewman
Bug 1063177 - Don't let plus button overlap search suggestion text. r=bnicholson
Bug 1058813 - Add telemetry probe for clicking sync preference. r=liuche
Bug 1063128 - Make sure all preferences have keys. r=liuche
Bug 1017903 - Remove synchronous search service initialization. r=liuche
Backed out changeset 279d7f0290da (bug 1017903)
Merge m-c to fx-team a=merge
Bug 1063109 - Allow for aapt to be invoked with max-res-version argument. r=nalexander
Bug 1063893 - Enable casting on beta and release. r=rnewman
Bug 1063643 - Allow for building Fennec with a limited set of resources. r=nalexander
Bug 927424 - Allow findbar binding to cancel content focusing when using RemoteFinder in an e10s window. r=evilpie.

--HG--
extra : source : 2f6420722723035b1ed11e5de8e1829e827552fa
Bug 1063991 - Lift inner class to avoid javac optimization failure. r=rnewman
Bug 1057186 - Add a way to specify that nsDefaultURIFixup should obey the domain whitelist when not using keyword searches. r=smaug

--HG--
extra : transplant_source : %D5%AC%02%CE34%F8%D8.%7E%87%9AZ%C0%B5%21%16%F5H%D3
Backed out changeset 7f58c77bb165 (bug 1057186) for xpshell bustage
Bug 1057186 - Add a way to specify that nsDefaultURIFixup should obey the domain whitelist when not using keyword searches. r=smaug

--HG--
extra : transplant_source : %92E.%2CV%E0%80%A4%B6%1B%E8D%91%0Ft%F3%5D%13%88%96
Bug 992679 - Context item to open split console and log element. r=harth
Bug 1036908 - Log search suggestion selections from about:home.  r=mak
Bug 1036912 -  Log selections of searchSuggestTable in newtab.  r=mak
Bug 1036914 - Log autocomplete selections which are like searches. r=mconley, r=mak
Bug 1049812 - Part 1 : Removes static_cast introduced by bug 922727 and set a bool property in DEBUG to ensure PlaceHashKey properties are set. r=mak