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

Skip to content
Commit a2b48a04 authored by Shikha Malhotra's avatar Shikha Malhotra Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Check for IOCTL feature changed to not set... 

[automerger skipped] Merge "Check for IOCTL feature changed to not set inheritence" am: 2af771c3 am: 541fdb3d am: cb7b7c1f -s ours am: 70379c81 -s ours

am skip reason: Merged-In Ia5baf127af5a078592d8b2db4b2f3d8c048a8692 with SHA-1 c18afa8a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2051231



Change-Id: I8f38873dac2e94ec47e2a31f4f27a10603a814d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1032260e 70379c81
Hide 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