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

Commit 6d42bf74 authored Mar 28, 2017 by Christopher Ferris Committed by android-build-merger Mar 28, 2017

Merge "Only allow short functions in class definitions." am: e3b27d22

am: 8726529e

Change-Id: I54f811e364fdec10f6b847da1f4e0e23a8fc5f28

parents 68a91fb9 8726529e

.clang-format-2

+1 −0

Original line number	Diff line number	Diff line
		BasedOnStyle: Google
		AllowShortFunctionsOnASingleLine: Inline
		ColumnLimit: 100
		CommentPragmas: NOLINT:.*
		DerivePointerAlignment: false

.clang-format-4

+1 −0

Original line number	Diff line number	Diff line
		BasedOnStyle: Google
		AccessModifierOffset: -2
		AllowShortFunctionsOnASingleLine: Inline
		ColumnLimit: 100
		CommentPragmas: NOLINT:.*
		DerivePointerAlignment: false