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

Commit 0eec4c6c authored Jan 09, 2024 by Treehugger Robot Committed by Automerger Merge Worker Jan 09, 2024

Merge "update mainline branch reminder from T to U" into main am: 01f625c0...

Merge "update mainline branch reminder from T to U" into main am: 01f625c0 am: 7aa150cd am: efe6216d

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

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

parents 67149528 efe6216d

tools/mainline_hook_partial.sh

+2 −2

Original line number	Diff line number	Diff line
		@@ -35,8 +35,8 @@

		## tunables:
		##
		DEV_BRANCH=master
		MAINLINE_BRANCH=tm-mainline-prod
		DEV_BRANCH=main
		MAINLINE_BRANCH=udc-mainline-prod
		filelist_file=MainlineFiles.cfg

		###

tools/mainline_hook_project.sh

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,8 +16,8 @@


		# tunables
		DEV_BRANCH=master
		MAINLINE_BRANCH=tm-mainline-prod
		DEV_BRANCH=main
		MAINLINE_BRANCH=udc-mainline-prod

		###
		RED=$(tput setaf 1)