Unmerged paths:
	both modified:   mozilla-release/mobile/android/app/build.gradle
	both modified:   mozilla-release/mobile/android/app/mobile.js
	both added:      mozilla-release/mobile/android/app/src/main/res/drawable/pwa_oboarding.png
	both added:      mozilla-release/mobile/android/app/src/main/res/layout/home_pager.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/BrowserToolbarTabletBase.java
	deleted by them: mozilla-release/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ForwardButton.java
	deleted by them: mozilla-release/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/TabCounter.java
	deleted by them: mozilla-release/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/action_bar_menu_item_colors.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/search_suggestion_text.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/tabs_counter_fg.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/tabs_counter_text.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/two_line_page_row_title.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/two_line_page_row_url.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/url_bar_image_color.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/url_bar_title.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/url_bar_title_highlight.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable-hdpi/folder_closed.png
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable-xhdpi/folder_closed.png
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable-xxhdpi/folder_closed.png
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable-xxxhdpi/folder_closed.png
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable/search_list_bg.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable/search_list_selector.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable/search_list_selector_private.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable/security_mode_icon.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable/url_bar_bg.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout-large-v11/browser_toolbar.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/browser_search.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/browser_toolbar.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/home_item_row.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/home_suggestion_prompt.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/private_tabs_panel.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/search_engine_row.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/suggestion_item.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/tabs_counter.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/toolbar_display_layout.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/toolbar_edit_layout.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/two_line_page_row.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/values-large-v17/styles.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/values-large/dimens.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/values-large/styles.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/values-sw400dp/dimens.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/values-v17/styles.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/values/colors.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/values/dimens.xml
	deleted by them: mozilla-release/mobile/android/app/src/photon/res/values/styles.xml
	both modified:   mozilla-release/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
	both modified:   mozilla-release/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java
	deleted by them: mozilla-release/mobile/android/chrome/content/WebcompatReporter.js
	both modified:   mozilla-release/mobile/android/gradle.configure
	both modified:   mozilla-release/mobile/android/gradle/product_flavors.gradle
	both modified:   mozilla-release/toolkit/mozapps/installer/packager.mk