commit 882f567a6e3a09af275a9ebda4f72d3dc93db8ab
author Tao Bao <tbao@google.com> Tue Dec 13 18:39:52 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 13 18:39:52 2016 +0000
tree aad15cae64329e42ad3647bf7dec716a1a8a1d0e
parent 882895a610f6a22008172e3f2243c403dc3b46c9
parent 59c917aa028e5377929b0095987e315b3dc44e70

Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb am: 3541850a9a am: 01afbb8f29
am: 59c917aa02

Change-Id: Ie85a2315272e009ad43b29728b080d890348a0b8

.clang-format

diff --git a/.clang-format b/.clang-format
index b8c6428..5322788 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,6 +1,7 @@
 BasedOnStyle: Google
 AllowShortBlocksOnASingleLine: false
-AllowShortFunctionsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: true
 
 ColumnLimit: 100
 CommentPragmas: NOLINT:.*