commit 74bc342b0a6b5cd71bf01ff7ca84edb4d5b03850
author Tom Cherry <tomcherry@google.com> Thu Jan 10 11:16:04 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 10 11:16:04 2019 -0800
tree 2947b2bcbe2a9bdf6bdf47ec889f2ef9b12895ea
parent d649d367e503012fc866f5a5d910bf2ccf4a6be6
parent f121aa381a6fa13483712f41f1a188da23b5dce8

Merge "Use the existing .clang-format-2 for liblog"
am: 29c44f5710

Change-Id: I15538f6d35883242d7ece108c4f1c5e9e234e0b1

liblog/.clang-format

diff --git a/liblog/.clang-format b/liblog/.clang-format
deleted file mode 100644
index 9db87a8..0000000
--- a/liblog/.clang-format
+++ /dev/null
@@ -1,9 +0,0 @@
-BasedOnStyle: Google
-AllowShortFunctionsOnASingleLine: false
-
-CommentPragmas: NOLINT:.*
-DerivePointerAlignment: false
-PointerAlignment: Left
-PenaltyExcessCharacter: 32
-
-Cpp11BracedListStyle: false

liblog/.clang-format

diff --git a/liblog/.clang-format b/liblog/.clang-format
new file mode 120000
index 0000000..fd0645f
--- /dev/null
+++ b/liblog/.clang-format
@@ -0,0 +1 @@
+../.clang-format-2
\ No newline at end of file