| commit | cd29fe261d37558d77664222815d2ab10c3ee7e2 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Wed Jan 16 20:42:33 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 16 20:42:33 2019 -0800 |
| tree | 7c3a93d70f7c39bf05b18589ae7d9951d283e467 | |
| parent | f09aa516a20a38a0aa3dcf4bff2c6d9f27067341 [diff] | |
| parent | 42f6bcba2e6477cefaf1a2d311c2b5171c12cb9f [diff] |
Merge "clatd's .clang-format shouldn't be kept in sync with system/core" am: 2356fefaf8 am: 42f6bcba2e Change-Id: I240f2c2909b4a7513bd1fbc4aa2cbe12f36a75d2
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