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

Commit b2e26a63 authored by Zach Johnson's avatar Zach Johnson Committed by android-build-merger
Browse files

Merge "Only use the new format in gd/"

am: 47a958f4

Change-Id: I4129cc39765902b3aec64180c814e8105ef95693
parents 2b6dae46 47a958f4
Loading
Loading
Loading
Loading
+0 −4
Original line number Original line Diff line number Diff line
@@ -22,7 +22,3 @@
BasedOnStyle: Google
BasedOnStyle: Google
CommentPragmas: NOLINT:.*
CommentPragmas: NOLINT:.*
DerivePointerAlignment: false
DerivePointerAlignment: false
ColumnLimit: 120
AllowShortFunctionsOnASingleLine: Empty
ConstructorInitializerAllOnOneLineOrOnePerLine: false
BreakConstructorInitializers: BeforeColon
+28 −0
Original line number Original line Diff line number Diff line
#
# Copyright 2016 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#      http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

#
# Below are some minor deviations from the default Google style to
# accommodate for handling of the large legacy code base.
#

BasedOnStyle: Google
CommentPragmas: NOLINT:.*
DerivePointerAlignment: false
ColumnLimit: 120
AllowShortFunctionsOnASingleLine: Empty
ConstructorInitializerAllOnOneLineOrOnePerLine: false
BreakConstructorInitializers: BeforeColon