Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
roytam1 2021-01-01 10:04:05 +08:00
commit a9f63c3e7d
573 changed files with 608 additions and 26006 deletions

View file

@ -4,9 +4,5 @@
#include ../../toolkit/components/telemetry/datareporting-prefs.js
#endif
#ifdef MOZ_SERVICES_HEALTHREPORT
#if MOZ_WIDGET_TOOLKIT == android
#include ../../mobile/android/chrome/content/healthreport-prefs.js
#else
#include ../../toolkit/components/telemetry/healthreport-prefs.js
#endif
#endif