commit 16b9916a95e9b65a60932dce6afd41a28b3e21b6
author Christopher Ferris <cferris@google.com> Tue Mar 28 21:54:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 28 21:54:11 2017 +0000
tree 2915da6885b3e1454bd7eb81e43be435fc7db412
parent aa736df44033d32df5ce4a0a7ead47a34ecb499f
parent 49ceb2abfe008ee8a9c16cab3b1aac3899c8292a

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

Change-Id: I7844af0a91a5b7d18409e9bd8f04519e3cd30f37

.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