Steven Knipe 1db1c7d82f Merge branch 'HEAD' of https://github.com/mozilla-mobile/fenix ... # Conflicts: # app/src/main/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTrayList.kt		2021-11-08 19:08:14 -08:00
..
sampledata
src	Merge branch 'HEAD' of https://github.com/mozilla-mobile/fenix	2021-11-08 19:08:14 -08:00
.gitignore
benchmark.gradle	For #21700: linting fixes	2021-10-14 21:03:05 +00:00
build.gradle	For #21084: put git hash on About screen in release builds.	2021-11-08 19:15:16 +00:00
lint-baseline.xml	For #21760 - Remove some unused resources	2021-10-13 20:42:49 +00:00
lint.xml	For #21861 - Ignore the UnusedResources lint check for localized strings	2021-10-12 14:48:47 +00:00
metrics.yaml	For #22155 - The inactiveTabsCount probe reports actualInactiveTabs number	2021-11-08 12:32:39 +00:00
pings.yaml
proguard-rules.pro