commit 7a6ca5ec75d7a4bdfa2e8f3d7b24b8d6f686d8a0
author Tom Cherry <tomcherry@google.com> Wed Mar 15 00:55:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 15 00:55:35 2017 +0000
tree 246e7f232aa7430990cbec98bd2c69d53b9d1937
parent 2117840fbb2e4f45b6a96722d150957865f8d120
parent 42a12f7b25e2407a0992cadba49ec1cc1fded885

Merge "Remove extraneous .clang-format files"
am: 42a12f7b25

Change-Id: I5062d81a01cde71a9bbe7549f9e3c9198af955ae

.clang-format

diff --git a/.clang-format b/.clang-format
deleted file mode 100644
index fc4eb1b..0000000
--- a/.clang-format
+++ /dev/null
@@ -1,13 +0,0 @@
-BasedOnStyle: Google
-AllowShortBlocksOnASingleLine: false
-AllowShortFunctionsOnASingleLine: false
-
-AccessModifierOffset: -2
-ColumnLimit: 100
-CommentPragmas: NOLINT:.*
-DerivePointerAlignment: false
-IndentWidth: 4
-PointerAlignment: Left
-TabWidth: 4
-UseTab: Never
-PenaltyExcessCharacter: 32

.clang-format

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