Bug 1062338 - Remove useless ic_menu_back drawable xml. r=lucasr
Bug 1024527 - Move search_strings.dtd into m/a/base/locales/en-US. r=Pike

--HG--
rename : mobile/android/search/strings/search_strings.dtd => mobile/android/base/locales/en-US/search_strings.dtd
Merge m-c to fx-team. a=merge
Bug 815682 - Lockscreen widget for guest sessions. r=bnicholson, rnewman
Bug 897711 - Show a notification when in guest mode. r=bnicholson
Bug 1060742 - Reorder BinarySearch.jsm arguments for easier curried search functions. r=adw
Merge m-c to fx-team. a=merge
Bug 1063748 - Follow-up: Add telemetry for Onboarding first run screen buttons. r=mfinkle
Backed out 2 changesets (bug 815682, bug 897711) for Android S4 failures.

Backed out changeset 14f00ee7be7d (bug 897711)
Backed out changeset 3de21c283716 (bug 815682)
Bug 887755 - Lightweight theme preview is broken r=margaret
Bug 1052009 - Enable CloudSync in Nightly (mochitest fix). r=gps
Bug 1053939 - pass entry point to fxa content server when opening about:accounts + tests. r=markh
Bug 1064743 - Support simultaneous sends in the transport. r=past
Bug 1052009 - Enable CloudSync in Nightly. r=rnewman
Bug 1064774 - Prevent script actor from breaking debugger protocol on unavailable resources. r=past
Bug 1064886: add "Enable E10S" checkbox to preferences, r=felipe

--HG--
extra : rebase_source : 34139fb9f2074b73b4cb5e6dcbad7357fff9149d
Bug 1064885: add prompt to encourage Nightly users to enable e10s, r=felipe

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