Bug 778279 - support multiple apps per origin in Android web runtime; r=mfinkle
Bug 1042300 - make in-content prefs nightly-only, r=MattN
Bug 1041906 Use AtomicReference for GeckoThread LaunchState. r=rnewman
Bug 1041026 - Move search bar logic into custom view. r=eedens
Bug 1041641 - Disable SearchFragment mainView click listener when creating view. r=eedens
Bug 948465 - Part 1: Register resource://android/ pointing to Fennec APK root. r=mfinkle

Consumers can access Android assets (and resources) by using
resource://android/assets/FILENAME.

The resource substitution is registered at app-startup time so that the
substitution is in place before any add-on has started up: as documented
at [1], "[an] add-on will not receive xpcom-startup or app-startup
notifications".

[1] https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Guide/Receiving_startup_notifications
Bug 948465 - Part 2: Tests. r=mfinkle
merge fx-team to mozilla-central a=merge