Commit 0830cddc authored Mar 19, 2015 by Dan Albert Committed by Android Git Automerger Mar 19, 2015

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

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

adb/.clang-format

+2 −2

Original line number	Diff line number	Diff line
		@@ -4,8 +4,8 @@ AllowShortFunctionsOnASingleLine: false

		CommentPragmas: NOLINT:.*
		DerivePointerAlignment: false
		IndentWidth: 2
		IndentWidth: 4
		PointerAlignment: Left
		TabWidth: 2
		TabWidth: 4
		UseTab: Never
		PenaltyExcessCharacter: 32