commit c4e397b4186af6e821da7e06029d5d7298a815c8
author Christopher Ferris <cferris@google.com> Thu Jul 19 16:33:53 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jul 19 16:33:53 2018 -0700
tree d84c0ba29d2bde9a414896ac0c877859b8f54434
parent c6d02eb4d35c80a956d629488a49215d9cdb14fa
parent ab1984ec5479a2261fae1d057c8dc63ced982848

Merge "Remove PenaltyExcessCharacter from clang-formats."
am: b8a2fa7fba

Change-Id: Ib234f3e5e210711185c68908dc8039ec19cd8a91

.clang-format-2

diff --git a/.clang-format-2 b/.clang-format-2
index 41591ce..ede5d7e 100644
--- a/.clang-format-2
+++ b/.clang-format-2
@@ -7,4 +7,3 @@
 PointerAlignment: Left
 TabWidth: 2
 UseTab: Never
-PenaltyExcessCharacter: 32

.clang-format-4

diff --git a/.clang-format-4 b/.clang-format-4
index 9127163..55773a2 100644
--- a/.clang-format-4
+++ b/.clang-format-4
@@ -9,4 +9,3 @@
 PointerAlignment: Left
 TabWidth: 4
 UseTab: Never
-PenaltyExcessCharacter: 32