Bug 809056 - Reduce thumbnailing impact by capturing and storing only top sites. r=markh
Bug 956943 - Replace Editor.extendSelection with CM version. r=vporof
Bug 865448 - Fix alignment issue of debug icon; r=anton
Merge m-c to fx-team.
Bug 950719 - Update Bing search icon to 32x32. r=mfinkle
Bug 921668 - Use correct BitmapDrawable constructor to ensure correct density is set. r=wesj
Bug 921557 - (Part 2) Update other deprecated BitmapDrawable constructor usage. r=wesj
Bug 946656: Increase state change timeout duration. r=margaret
Backed out changeset 194f941f2064 (bug 809056) for mochitest-bc bustage
Bug 941725 - Add emacs and vim key bindings to source editor. r=harth r=benvie r=msucan
bug 956956 fix permissions anchor for social sidebar, r=markh
Bug 957037 - Pull in Android's ProxySelectorImpl code so we can bypass creating Uri objects r=blassey
bug 956910 Australis fix gear icon in social sidebar for win/lin, r=markh
Merge m-c to fx-team
Back out f122349d9fbd (bug 941725) for debug and ASan bc timeouts in browser_codemirror.js
CLOSED TREE
Merge m-c to fx-team
CLOSED TREE
Bug 957259 - Error: "TypeError: caretPos is null" in SelectionHandler.js @ line: 585, r=margaret
merge fx-team to mozilla-central
Backed out changeset 0d1e734bbd0c (bug 956910)
Merge mozilla-central into holly.