summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yifan Hong <elsk@google.com> 2021-04-19 21:59:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-04-19 21:59:42 +0000
commit6c6323d61c4205116279f39c41dd097ddeccc9df (patch)
tree732f9fd851a8749bc94d20d6de032c47c371ebb0
parente86260a3534ffde8c5c39fdf8953db5db4677f94 (diff)
parent839e56672e876b85f6e7b6f217354066cc14dced (diff)
Merge "clang-format: Add IncludeBlocks: Preserve" am: 2408570981 am: 839e56672e
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1676648 Change-Id: Ic8e583be9816406e255cbcfb8f29b59a079e09e8
-rw-r--r--.clang-format1
1 files changed, 1 insertions, 0 deletions
diff --git a/.clang-format b/.clang-format
index 03af56d640..6725a1fde8 100644
--- a/.clang-format
+++ b/.clang-format
@@ -11,3 +11,4 @@ ContinuationIndentWidth: 8
IndentWidth: 4
PenaltyBreakBeforeFirstCallParameter: 100000
SpacesBeforeTrailingComments: 1
+IncludeBlocks: Preserve