commit 6d42bf740b7533847e4d78ab39b1d5da291e1895
author Christopher Ferris <cferris@google.com> Tue Mar 28 21:39:46 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 28 21:39:46 2017 +0000
tree cc752387e1b319361b50b69435c1e092b3001c52
parent 68a91fb95b047e1c9bef5cb276ebd4aeed965e2f
parent 8726529e3ecff37a0b609f8fd37959ac8628f7b8

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

Change-Id: I54f811e364fdec10f6b847da1f4e0e23a8fc5f28

.clang-format-2

diff --git a/.clang-format-2 b/.clang-format-2
index aab4665..41591ce 100644
--- a/.clang-format-2
+++ b/.clang-format-2
@@ -1,4 +1,5 @@
 BasedOnStyle: Google
+AllowShortFunctionsOnASingleLine: Inline
 ColumnLimit: 100
 CommentPragmas: NOLINT:.*
 DerivePointerAlignment: false

.clang-format-4

diff --git a/.clang-format-4 b/.clang-format-4
index 1497447..ae4a451 100644
--- a/.clang-format-4
+++ b/.clang-format-4
@@ -1,5 +1,6 @@
 BasedOnStyle: Google
 AccessModifierOffset: -2
+AllowShortFunctionsOnASingleLine: Inline
 ColumnLimit: 100
 CommentPragmas: NOLINT:.*
 DerivePointerAlignment: false