Merge "Only allow short functions in class definitions."

am: e3b27d22bf

Change-Id: Id56de01fede79702bc1942abcd4baf147968141f
This commit is contained in:
Christopher Ferris 2017-03-28 21:34:47 +00:00 committed by android-build-merger
commit 8726529e3e
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