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