Bug 918383 - Fix app debugging when connecting to a simulator app that isn't installed yet. r=paul
Merge mozilla-central and fx-team
Bug 908878 - Fix for intermittent browser_webconsole_bug_595350_multiple_windows_and_tabs.js | Timed out while waiting for: 4 web consoles {opened|closed}; r=me
Bug 916997 - All lines are joined into one line when copying text from the Web Console; r=past
Bug 791475 - Android updater notification should provide more information like progress. r=snorp
Bug 905226 - Identify custom JSON MIME-types as text. r=vporof

MIME types that can't be identified as textual are base64 encoded before
being shown in the Network Monitor tab of the developer tools. This text
detection wasn't identifying "custom" JSON MIME-types like
"application/x-bigcorp-api-json" as being JSON, and consequently they were
shown in a rather unhelpful base64 form.

This patch extends and liberalizes the isTextMimeType method to identify
these forms correctly.
Bug 913014 - Double clicking on a computed style toggles the matched selectors. r=harth
Bug 917863 - Add XUL context menu back into rule and computed views. r=jwalker
Bug 918588 - Properly support off after once with EventEmitter. r=mratcliffe
Backed out 3 changesets (bug 893446, bug 893011, bug 869543)

Backed out changeset 452ca8b779f3 (bug 893446)
Backed out changeset e1bf70be67ec (bug 893011)
Backed out changeset 60865db5f5dc (bug 869543)
Bug 917394 - Rearrange about:home tabs as per new design (r=sriram)

--HG--
rename : mobile/android/base/home/MostVisitedPage.java => mobile/android/base/home/TopSitesPage.java
rename : mobile/android/base/resources/layout/home_most_visited_page.xml => mobile/android/base/resources/layout/home_top_sites_page.xml
Bug 833800: Change the pin to be an image. [r=wesj]
Bug 833800: FadedTextView should handle compound drawables. [r=lucasr]
Bug 917396: Move the grid to "TopSites" page. [r=lucasr]

--HG--
rename : mobile/android/base/home/PinBookmarkDialog.java => mobile/android/base/home/PinSiteDialog.java
rename : mobile/android/base/home/TopBookmarksAdapter.java => mobile/android/base/home/TopSitesGridAdapter.java
rename : mobile/android/base/home/TopBookmarkItemView.java => mobile/android/base/home/TopSitesGridItemView.java
rename : mobile/android/base/home/TopBookmarksView.java => mobile/android/base/home/TopSitesGridView.java
rename : mobile/android/base/home/BookmarkThumbnailView.java => mobile/android/base/home/TopSitesThumbnailView.java
rename : mobile/android/base/resources/color/top_bookmark_item_title.xml => mobile/android/base/resources/color/top_sites_grid_item_title.xml
rename : mobile/android/base/resources/drawable-hdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-hdpi/top_site_add.png
rename : mobile/android/base/resources/drawable-mdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-mdpi/top_site_add.png
rename : mobile/android/base/resources/drawable-xhdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-xhdpi/top_site_add.png
rename : mobile/android/base/resources/drawable/bookmark_thumbnail_bg.xml => mobile/android/base/resources/drawable/top_sites_thumbnail_bg.xml
rename : mobile/android/base/resources/layout/pin_bookmark_dialog.xml => mobile/android/base/resources/layout/pin_site_dialog.xml
rename : mobile/android/base/resources/layout/top_bookmark_item_view.xml => mobile/android/base/resources/layout/top_sites_grid_item_view.xml
rename : mobile/android/base/resources/menu/top_bookmarks_contextmenu.xml => mobile/android/base/resources/menu/top_sites_contextmenu.xml
Bug 833800: LinearLayout of android doesn't have the third constructor in pre-ICS. [r=margaret]
Bug 917396: Crash in resetting the loader. [r=lucasr]
Bug 917455 - Revert getTopBookmarks back to getTopSites. r=wesj
Bug 917455 - Update top sites behaviour for about:home's Top Sites panel (r=wesj)
Bug 917455: Use a single cursor for the grid and the list. [r=lucasr]
Merge m-c to fig

--HG--
rename : mobile/android/base/home/PinBookmarkDialog.java => mobile/android/base/home/PinSiteDialog.java
rename : mobile/android/base/home/TopBookmarksView.java => mobile/android/base/home/TopSitesGridView.java
rename : mobile/android/base/home/MostVisitedPage.java => mobile/android/base/home/TopSitesPage.java
rename : mobile/android/base/home/BookmarkThumbnailView.java => mobile/android/base/home/TopSitesThumbnailView.java
rename : mobile/android/base/resources/color/top_bookmark_item_title.xml => mobile/android/base/resources/color/top_sites_grid_item_title.xml
rename : mobile/android/base/resources/drawable-hdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-hdpi/top_site_add.png
rename : mobile/android/base/resources/drawable-mdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-mdpi/top_site_add.png
rename : mobile/android/base/resources/drawable-xhdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-xhdpi/top_site_add.png
rename : mobile/android/base/resources/drawable/bookmark_thumbnail_bg.xml => mobile/android/base/resources/drawable/top_sites_thumbnail_bg.xml
rename : mobile/android/base/resources/layout/home_most_visited_page.xml => mobile/android/base/resources/layout/home_top_sites_page.xml
rename : mobile/android/base/resources/layout/pin_bookmark_dialog.xml => mobile/android/base/resources/layout/pin_site_dialog.xml
rename : mobile/android/base/resources/menu/top_bookmarks_contextmenu.xml => mobile/android/base/resources/menu/top_sites_contextmenu.xml
extra : amend_source : 459360495389bad89cab14a8bd70f3dacb10d9f5