Merge "Only allow short functions in class definitions." am: e3b27d22bf am: 8726529e3e am: 6d42bf740b

am: 88b10f99a6

Change-Id: I7844af0a91a5b7d18409e9bd8f04519e3cd30f37
This commit is contained in:
Christopher Ferris 2017-03-28 21:54:11 +00:00 committed by android-build-merger
commit df40a2de67
2 changed files with 2 additions and 0 deletions

View File

@ -1,4 +1,5 @@
BasedOnStyle: Google
AllowShortFunctionsOnASingleLine: Inline
ColumnLimit: 100
CommentPragmas: NOLINT:.*
DerivePointerAlignment: false

View File

@ -1,5 +1,6 @@
BasedOnStyle: Google
AccessModifierOffset: -2
AllowShortFunctionsOnASingleLine: Inline
ColumnLimit: 100
CommentPragmas: NOLINT:.*
DerivePointerAlignment: false