summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2019-01-16 20:42:33 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-16 20:42:33 -0800
commitcd29fe261d37558d77664222815d2ab10c3ee7e2 (patch)
tree7c3a93d70f7c39bf05b18589ae7d9951d283e467
parentf09aa516a20a38a0aa3dcf4bff2c6d9f27067341 (diff)
parent42f6bcba2e6477cefaf1a2d311c2b5171c12cb9f (diff)
downloadplatform_external_android-clat-cd29fe261d37558d77664222815d2ab10c3ee7e2.tar.gz
platform_external_android-clat-cd29fe261d37558d77664222815d2ab10c3ee7e2.tar.bz2
platform_external_android-clat-cd29fe261d37558d77664222815d2ab10c3ee7e2.zip
Merge "clatd's .clang-format shouldn't be kept in sync with system/core" am: 2356fefaf8
am: 42f6bcba2e Change-Id: I240f2c2909b4a7513bd1fbc4aa2cbe12f36a75d2
-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