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

Commit 6ec6769f authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Stop duplicating <linux/capabilities.h>." into main am: 8d983ee8 am:... 

Merge "Stop duplicating <linux/capabilities.h>." into main am: 8d983ee8 am: a441e2ef am: edb21216 am: 798327b6 am: 952aa920

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



Change-Id: I1112912c33b2d94ab841fd1cad0f3a0ce61fc71d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47ec1767 952aa920
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment