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