Bug 918079 - Show highlight when overscrolling. r=kats
Bug 909159: Define UNKNOWN_XPCOM_ABI in AddonManager.jsm. r=Unfocused
Merge m-c to fx-team
Bug 918917 - Show no favicon until load fails, then show default favicon, or the result (r=margaret)
Bug 896574 - Fix testAddSearchEngine to work with the new about:home. r=lucasr
Bug 875731 - Replace callers of nsIDownloadManager.usersDownloadsDirectory with Downloads.getUserDownloadsDirectory mobile/andriod/. r=mfinkle
Bug 915355 - Part 1: Add comment clarifying a keyword-search event. r=gavin
Bug 915355 - Part 2: Add clarifying comments on keyword-search to Android code. r=rnewman
Bug 915355 - Part 3: Update default search engine comment to be more descriptive. r=rnewman
Bug 911574 - Allow subframe panning on the body. r=wesj
Bug 911152 - Don't reprocess the same metadata over and over. r=wesj
Bug 921477 - Fix typo causing certificate usage failure. rs=wesj
Bug 920317: Banner cuts off TopSitesPage. [r=margaret]

--HG--
rename : b2g/config/emulator-ics/config.json => b2g/config/emulator/config.json
rename : b2g/config/emulator-ics/releng-emulator-ics.tt => b2g/config/emulator/releng-emulator.tt
extra : rebase_source : cdbc79b907ad0d90ff315966e645535ffb4a39b9
Bug 913983 - Split browser_telemetry_buttonsandsidebar.js into 5 tests due to timeouts. r=jwalker
Bug 920509 - [app manager] Don't use hiddenDOMWindow in styles.js. r=dcamp
Bug 918682 - Fix the check for finding the root content document's root scroll frame. r=tn
Bug 921117 - Enhanced Robocop screenshots, r=jmaher
Bug 472963 - TableExists and IndexExists does not work for temporary tables, r=mak
Turn on app update mochitest-chrome debug logging to try to figure out Bug 918029 - Intermittent TEST-UNEXPECTED-FAIL | test_0017_check_staging_basic.xul | Test timed out. Maximum time allowed is 90 seconds | Checking if TESTS[3] test was performed... callback function name = defaultCallback, pageid = finished |and more updater failures. r=bbondy
Backed out changeset d3c5c7c61894