Merge "Return default value if fingerprint doesn't match" into main
diff --git a/core/Makefile b/core/Makefile
index dbb8976..a7ab442 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -872,6 +872,7 @@
SOONG_CONV_DATA := $(call intermediates-dir-for,PACKAGING,soong_conversion)/soong_conv_data
$(SOONG_CONV_DATA):
@rm -f $@
+ @touch $@ # This file must be present even if SOONG_CONV is empty.
@$(foreach s,$(SOONG_CONV),echo "$(s),$(SOONG_CONV.$(s).TYPE),$(sort $(SOONG_CONV.$(s).PROBLEMS)),$(sort $(filter-out $(SOONG_ALREADY_CONV),$(SOONG_CONV.$(s).DEPS))),$(sort $(SOONG_CONV.$(s).MAKEFILES)),$(sort $(SOONG_CONV.$(s).INSTALLED))" >>$@;)
$(call declare-1p-target,$(SOONG_CONV_DATA),build)
diff --git a/teams/Android.bp b/teams/Android.bp
index 6307f5c..a2b0d14 100644
--- a/teams/Android.bp
+++ b/teams/Android.bp
@@ -3367,6 +3367,13 @@
}
team {
+ name: "trendy_team_aaos_display_safety_triage",
+
+ // go/trendy/manage/engineers/6522093663780864
+ trendy_team_id: "6522093663780864",
+}
+
+team {
name: "trendy_team_camera_htc_lg_qualcomm",
// go/trendy/manage/engineers/6332099480911872