Merge "Add 100 column limit to .clang-format."

am: b03e6bf924

* commit 'b03e6bf9247bb36162b9f4c61d07e488a18e126c':
  Add 100 column limit to .clang-format.
This commit is contained in:
Josh Gao 2015-11-11 22:25:42 +00:00 committed by android-build-merger
commit 504e3274a0

View File

@ -2,6 +2,7 @@ BasedOnStyle: Google
AllowShortBlocksOnASingleLine: false
AllowShortFunctionsOnASingleLine: false
ColumnLimit: 100
CommentPragmas: NOLINT:.*
DerivePointerAlignment: false
IndentWidth: 2