Commit f7891609 authored Apr 20, 2021 by Yifan Hong Committed by Automerger Merge Worker Apr 20, 2021

Merge "clang-format: Add IncludeBlocks: Preserve" am: 24085709 am: 839e5667 am: 6c6323d6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1676648

Change-Id: I3a4d573b27d562c177e98236f3785613c235e5a5

.clang-format

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,3 +11,4 @@ ContinuationIndentWidth: 8
		IndentWidth: 4
		PenaltyBreakBeforeFirstCallParameter: 100000
		SpacesBeforeTrailingComments: 1
		IncludeBlocks: Preserve