Merge "Only allow short functions in class definitions." am: e3b27d22bf

am: 8726529e3e

Change-Id: I54f811e364fdec10f6b847da1f4e0e23a8fc5f28
This commit is contained in:
Christopher Ferris 2017-03-28 21:39:46 +00:00 committed by android-build-merger
commit 6d42bf740b
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