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

This commit is contained in:
Automerger Merge Worker
2023-05-10 17:08:58 +00:00
committed by Android (Google) Code Review

View File

@@ -2,7 +2,7 @@ BasedOnStyle: Google
AccessModifierOffset: -4 AccessModifierOffset: -4
AlignOperands: false AlignOperands: false
AllowShortFunctionsOnASingleLine: Inline AllowShortFunctionsOnASingleLine: Empty
AlwaysBreakBeforeMultilineStrings: false AlwaysBreakBeforeMultilineStrings: false
ColumnLimit: 100 ColumnLimit: 100
CommentPragmas: NOLINT:.* CommentPragmas: NOLINT:.*