summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2019-01-16 20:46:39 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-16 20:46:39 -0800
commit56c625999a4434e7b285ea8c43bcdb648872f45d (patch)
tree7c3a93d70f7c39bf05b18589ae7d9951d283e467
parentbcdbcd9f0f7e0b6649a5e9a3aacca775087ae975 (diff)
parentcd29fe261d37558d77664222815d2ab10c3ee7e2 (diff)
downloadplatform_external_android-clat-56c625999a4434e7b285ea8c43bcdb648872f45d.tar.gz
platform_external_android-clat-56c625999a4434e7b285ea8c43bcdb648872f45d.tar.bz2
platform_external_android-clat-56c625999a4434e7b285ea8c43bcdb648872f45d.zip
Merge "clatd's .clang-format shouldn't be kept in sync with system/core" am: 2356fefaf8 am: 42f6bcba2e
am: cd29fe261d Change-Id: I907be6a3747c715acbd357fa8d6cd8c07370dbc1
-rw-r--r--.clang-format3
1 files changed, 0 insertions, 3 deletions
diff --git a/.clang-format b/.clang-format
index 6682f77..f1debbd 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,6 +1,3 @@
-# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
-# Please keep this file in sync with system/core/.clang-format-4
-#
BasedOnStyle: Google
AlignConsecutiveAssignments: true
AlignEscapedNewlines: Right