Commit 1942925d authored May 10, 2023 by Automerger Merge Worker Committed by Android (Google) Code Review May 10, 2023

Merge "Merge "Align clang-format with the Checkstyle hook for short...

Merge "Merge "Align clang-format with the Checkstyle hook for short functions." am: 68a7e2a9 am: f622ebe7" into tm-qpr-dev-plus-aosp

.clang-format

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ BasedOnStyle: Google

		AccessModifierOffset: -4
		AlignOperands: false
		AllowShortFunctionsOnASingleLine: Inline
		AllowShortFunctionsOnASingleLine: Empty
		AlwaysBreakBeforeMultilineStrings: false
		ColumnLimit: 100
		CommentPragmas: NOLINT:.*