Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76ec1d3f authored Sep 22, 2022 by Treehugger Robot Committed by Automerger Merge Worker Sep 22, 2022

Merge "update sc-mainline-prod -> tm_mainline_prod" am: 3fa17b83 am:...

Merge "update sc-mainline-prod -> tm_mainline_prod" am: 3fa17b83 am: 2eeb82c4 am: 4e790d8c am: 521348b8

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2222298

Change-Id: I95f726d9ebbb2c7b29e83b2883dad1cb2cd22782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents d5698c63 521348b8

tools/OWNERS

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		# Bug component: 1344
		essick@google.com

		# reliability builds mainline trains, so needs to manage these scripts
		include platform/frameworks/av/:/media/janitors/reliability_mainline_OWNERS

tools/mainline_hook_partial.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@
		## tunables:
		##
		DEV_BRANCH=master
		MAINLINE_BRANCH=sc-mainline-prod
		MAINLINE_BRANCH=tm-mainline-prod
		filelist_file=MainlineFiles.cfg

		###

tools/mainline_hook_project.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@

		# tunables
		DEV_BRANCH=master
		MAINLINE_BRANCH=sc-mainline-prod
		MAINLINE_BRANCH=tm-mainline-prod

		###
		RED=$(tput setaf 1)