| commit | 780d7d9f736a958bb40f27c3baf12873fb40129d | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Mar 19 20:30:14 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Mar 19 20:30:15 2015 +0000 |
| tree | 86ecc64ae4cb13499d17ae3933064449433a740a | |
| parent | b3b088e62308f8a61a27677a968a9e513a8582bc [diff] | |
| parent | 683238c3c45628666a9eb0880a067a61358a4dfe [diff] |
Merge "Fix clang-format file for correct indent settings."
diff --git a/adb/.clang-format b/adb/.clang-format index 2b83a1f..0395c8e 100644 --- a/adb/.clang-format +++ b/adb/.clang-format
@@ -4,8 +4,8 @@ CommentPragmas: NOLINT:.* DerivePointerAlignment: false -IndentWidth: 2 +IndentWidth: 4 PointerAlignment: Left -TabWidth: 2 +TabWidth: 4 UseTab: Never PenaltyExcessCharacter: 32