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

Commit 88b10f99 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

am: 6d42bf74

Change-Id: Idc253544cca63619abb2070390e52bf325699709

parents 3542659e 6d42bf74

.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