Merge remote-tracking branch 'origin/lineage-22.2' into a15

build/tools/merge_dtbs.py

+1 −0

Original line number	Diff line number	Diff line
		@@ -266,6 +266,7 @@ class DeviceTree(DeviceTreeInfo):
		EXTRA_KEYS = (
		('oplus,hw-id', 1),
		('oplus,project-id', 1),
		('qcom,oem-id', 1),
		('xiaomi,miboard-id', 2),
		)