commit 97629cf301e2cdd4769973bf3827a0f11d3453e3
author Bo Hu <bohu@google.com> Tue Mar 28 22:20:54 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 28 22:20:55 2017 +0000
tree 8246d0ebc412e0070f0d6563192cf79672151630
parent df40a2de67e60bb30f44610a63684f38ad1090ab
parent 63ef9ff5fa4b1e68029a54bb60c97b99bdf5defc

Merge changes from topic 'revert-pipe'

* changes:
  Revert "Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe"
  Revert "Emulator: Enhance qemu_pipe.h to handle partial rw"
  Revert "Qemu: make the qemu_pipe_open back compatible"

.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