Merge "system-clang-format: Add IncludeBlocks: Preserve" am: c4253b0ac9

am: 6030b711c0

Change-Id: I6a8aa242445e183cfab5682b459c5a1b2b83f44b
This commit is contained in:
Tom Cherry 2019-06-05 21:21:01 -07:00 committed by android-build-merger
commit 6249eee018
2 changed files with 2 additions and 0 deletions

View File

@ -4,6 +4,7 @@ AllowShortFunctionsOnASingleLine: Inline
ColumnLimit: 100
CommentPragmas: NOLINT:.*
DerivePointerAlignment: false
IncludeBlocks: Preserve
IndentWidth: 4
ContinuationIndentWidth: 8
PointerAlignment: Left

View File

@ -3,6 +3,7 @@ AllowShortFunctionsOnASingleLine: Inline
ColumnLimit: 100
CommentPragmas: NOLINT:.*
DerivePointerAlignment: false
IncludeBlocks: Preserve
IndentWidth: 2
PointerAlignment: Left
TabWidth: 2