commit 85eb386159fb9db65728db1b1d7fd40ad1df87ac
author Dan Albert <danalbert@google.com> Thu Mar 19 20:50:32 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 19 20:50:32 2015 +0000
tree 820a91db12a219aba8fa12dfd07fee55e8964562
parent d1ede92feda75ae3f7d9f7b3cc100fc4fce3ebbc
parent 35265355caf6ba9c560af2bfab4dda9ffb6a1197

am 62571611: am 780d7d9f: Merge "Fix clang-format file for correct indent settings."

* commit '62571611ae10e426d28fe590106fccf6b39e086f':
  Fix clang-format file for correct indent settings.

adb/.clang-format

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