Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef3017bd authored Mar 15, 2017 by Tom Cherry Committed by android-build-merger Mar 15, 2017

Merge "Remove extraneous .clang-format files"

am: 41c7bb50

Change-Id: I5062d81a01cde71a9bbe7549f9e3c9198af955ae

parents a968df9e 41c7bb50

.clang-format-2

+0 −4

Original line number	Diff line number	Diff line
		BasedOnStyle: Google
		AllowShortBlocksOnASingleLine: false
		AllowShortFunctionsOnASingleLine: true

		AccessModifierOffset: -1
		ColumnLimit: 100
		CommentPragmas: NOLINT:.*
		DerivePointerAlignment: false

.clang-format-4

+0 −3

Original line number	Diff line number	Diff line
		BasedOnStyle: Google
		AllowShortBlocksOnASingleLine: false
		AllowShortFunctionsOnASingleLine: false

		AccessModifierOffset: -2
		ColumnLimit: 100
		CommentPragmas: NOLINT:.*

adb/.clang-format

deleted100644 → 0

+1 −13

Original line number	Diff line number	Diff line
		BasedOnStyle: Google
		AllowShortBlocksOnASingleLine: false
		AllowShortFunctionsOnASingleLine: false

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

adb/.clang-format

0 → 120000

+1 −13

Original line number	Diff line number	Diff line
		../.clang-format-4
		No newline at end of file

base/.clang-format

deleted100644 → 0

+1 −11

Original line number	Diff line number	Diff line
		BasedOnStyle: Google
		AllowShortBlocksOnASingleLine: false
		AllowShortFunctionsOnASingleLine: false

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