commit c4253b0ac98916ae851855adabd41c3aa17baa41
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 06 01:37:08 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 06 01:37:08 2019 +0000
tree a1ca3e1a300b78bca8f9f7135853905c180a145d
parent 4f67c42d7637fd28242e7fab20c6a7099de2c03c
parent c077eefc1e5007a5c656183737e82d5c0a7df855

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

scripts/system-clang-format

diff --git a/scripts/system-clang-format b/scripts/system-clang-format
index 55773a2..14abd93 100644
--- a/scripts/system-clang-format
+++ b/scripts/system-clang-format
@@ -4,6 +4,7 @@
 ColumnLimit: 100
 CommentPragmas: NOLINT:.*
 DerivePointerAlignment: false
+IncludeBlocks: Preserve
 IndentWidth: 4
 ContinuationIndentWidth: 8
 PointerAlignment: Left

scripts/system-clang-format-2

diff --git a/scripts/system-clang-format-2 b/scripts/system-clang-format-2
index ede5d7e..e28b379 100644
--- a/scripts/system-clang-format-2
+++ b/scripts/system-clang-format-2
@@ -3,6 +3,7 @@
 ColumnLimit: 100
 CommentPragmas: NOLINT:.*
 DerivePointerAlignment: false
+IncludeBlocks: Preserve
 IndentWidth: 2
 PointerAlignment: Left
 TabWidth: 2