Merge "Align clang-format with the Checkstyle hook for short functions." am: 68a7e2a941 am: f622ebe7b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2507737 Change-Id: I82d95a018e20b22a3229ac3f5f89c5f54269687b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -2,7 +2,7 @@ BasedOnStyle: Google
|
||||
|
||||
AccessModifierOffset: -4
|
||||
AlignOperands: false
|
||||
AllowShortFunctionsOnASingleLine: Inline
|
||||
AllowShortFunctionsOnASingleLine: Empty
|
||||
AlwaysBreakBeforeMultilineStrings: false
|
||||
ColumnLimit: 100
|
||||
CommentPragmas: NOLINT:.*
|
||||
|
||||
Reference in New Issue
Block a user