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

Commit 75ad5d87 authored by Bruce Po's avatar Bruce Po Committed by Automerger Merge Worker
Browse files

Merge "Revert "Remove cutils threads.h header completely."" into main am:...

Merge "Revert "Remove cutils threads.h header completely."" into main am: ef2cae13 am: 996bc30a am: d79550d8

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2712413



Change-Id: I78cc27ea609bf22bf3199c0988ea4888f8c362c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents af1918f9 d79550d8
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2007 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.
 */
+1 −0
Original line number Diff line number Diff line
../../include/cutils/threads.h
 No newline at end of file