Bug 919516 - No need to account for header views in Bookmarks page (r=mfinkle)
Bug 922116 - Don't clear FaviconView image data in formatImage. r=lucasr,margaret
Bug 911695 - Use correct dppx values for HDPI and XHDPI devices (r=margaret)
Bug 920170 - Move Android prompt service components to their own namespace. r=margaret

--HG--
rename : mobile/android/base/Prompt.java => mobile/android/base/prompts/Prompt.java
rename : mobile/android/base/PromptInput.java => mobile/android/base/prompts/PromptInput.java
rename : mobile/android/base/PromptService.java => mobile/android/base/prompts/PromptService.java
Bug 923186 - Download button should use regular XBL. r=mconley
Bug 922934 - Hide Metro context menus on touchstart, scroll, or mousedown [r=emtwo]
Bug 899980 - Show fox in urlbar if on start screen, search glass if searching r=mbrubeck

--HG--
extra : rebase_source : 0efadfc4f7a45e6e37984487336a5f1025706194
Bug 859579 - disable pdf.js in metro Firefox r=mbrubeck

--HG--
extra : rebase_source : 4a70d0b03269e0a600e3e738fdcd654f9e710f4c
Bug 871806 - Preloaded bookmarks have no color or favicon on first browser load r=mbrubeck

--HG--
extra : rebase_source : 58a0acc98968de0aeda855a6cedce8340d2f997a
Back out ca56f76237df (bug 922934) because of metro-chrome test failures
Bug 892684 - Clean up some code in AsyncPanZoomController [r=kats]
Bug 892684 - Implement axis locking in AsyncPanZoomController [r=kats,botond]
Bug 915328 - Add support for cross-slide gesture to APZC [r=kats]
Bug 915328 - Metro front-end fixes for cross slide with async panning [r=sfoster]
Bug 922934 - Hide Metro context menus on touchstart, scroll, or mousedown [r=emtwo]
Bug 922847 - Separate animation from download button, r=mconley
Merge fx-team to mozilla-central
Merge m-i to m-c
Merge m-c to m-i