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

Skip to content
Commit 3b3aecbe authored by Dmitrii Merkurev's avatar Dmitrii Merkurev Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "OemLockService: support oemlock AIDL hal" am:... 

[automerger skipped] Merge "OemLockService: support oemlock AIDL hal" am: 00d45983 am: 6e80d3ea am: b4f48581 -s ours

am skip reason: Merged-In I88166cba3858dffced32fb46d59880cd844af4a7 with SHA-1 7a9e42a0 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2590006



Change-Id: If1786e704eacb12e4135c5c559e2f3f128c93320
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 81efc063 b4f48581
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment