diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-10 17:11:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-10 17:11:04 +0000 |
| commit | 9142811fa3af38ace9ecaa33861356cdf03a9ebc (patch) | |
| tree | 0d7a0bfe2ed5f497ad8cff40fd075cdebbb97b98 /.clang-format | |
| parent | db3d7f2ac978b83ac86cec5c0dad6f5337708a04 (diff) | |
| parent | 1942925d5db7b4d0160701853ba8fe1de25874db (diff) | |
| download | base-9142811fa3af38ace9ecaa33861356cdf03a9ebc.tar.gz | |
Merge "Merge "Align clang-format with the Checkstyle hook for short functions." am: 68a7e2a941 am: f622ebe7b5" into tm-qpr-dev-plus-aosp am: 1942925d5d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2507737
Change-Id: Id9ff7aebc173652ecd041b47ed6bb6aca849d801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format index d60d33c08f3f..0f6b166ecdd5 100644 --- a/.clang-format +++ b/.clang-format @@ -2,7 +2,7 @@ BasedOnStyle: Google AccessModifierOffset: -4 AlignOperands: false -AllowShortFunctionsOnASingleLine: Inline +AllowShortFunctionsOnASingleLine: Empty AlwaysBreakBeforeMultilineStrings: false ColumnLimit: 100 CommentPragmas: NOLINT:.* |