Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb am: 3541850a9a am: 01afbb8f29

am: 59c917aa02

Change-Id: Ie85a2315272e009ad43b29728b080d890348a0b8
This commit is contained in:
Tao Bao
2016-12-13 18:39:52 +00:00
committed by android-build-merger
+2 -1
View File
@@ -1,6 +1,7 @@
BasedOnStyle: Google
AllowShortBlocksOnASingleLine: false
AllowShortFunctionsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: true
ColumnLimit: 100
CommentPragmas: NOLINT:.*