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

am: 01afbb8f29

Change-Id: I60bd86901647ada3debee5ec4314c2b8287afefb
This commit is contained in:
Tao Bao
2016-12-13 18:33:51 +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:.*