Merge "clang-format: Adjust short functions / if settings."

am: d6a5005fcb

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